浏览代码

AMBARI-3830 Incorrect behavior of Ambari with logged on user without admin rights.. (ababiichuk)

aBabiichuk 11 年之前
父节点
当前提交
a61a83623c

+ 4 - 2
ambari-web/app/templates/common/configs/capacity_scheduler.hbs

@@ -68,8 +68,10 @@
                                 <div {{bindAttr class="errorMessage:error: :control-group"}}>
                                   {{view viewClass serviceConfigBinding="this" categoryConfigsBinding="view.categoryConfigs" }}
                                   {{#if view.canEdit}}
-                                      {{#if isRemovable}}
-                                          <a class="action" {{action "removeProperty" this target="view" }} ><i class="icon-minus-sign"></i>{{t common.remove}}</a>
+                                      {{#if App.isAdmin}}
+                                        {{#if isRemovable}}
+                                            <a class="action" {{action "removeProperty" this target="view" }} ><i class="icon-minus-sign"></i>{{t common.remove}}</a>
+                                        {{/if}}
                                       {{/if}}
                                   {{/if}}
                                     <span class="help-inline">{{errorMessage}}</span>

+ 4 - 2
ambari-web/app/templates/common/configs/overriddenProperty.hbs

@@ -25,9 +25,11 @@
       {{/if}}
       {{#if overriddenSCP.isEditable}}
 	      {{#if isNotDefaultValue}}
-	        <a class="action" {{action "doRestoreDefaultValue" this target="view" }} ><i class="icon-undo"></i>Undo</a>
+	        <a class="action" {{action "doRestoreDefaultValue" this target="view" }} ><i class="icon-undo"></i>{{t common.undo}}</a>
 	      {{/if}}
-	      <a class="action" {{action "removeOverride" overriddenSCP target="view" }} ><i class="icon-minus-sign"></i>Remove</a>
+        {{#if App.isAdmin}}
+	        <a class="action" {{action "removeOverride" overriddenSCP target="view" }} ><i class="icon-minus-sign"></i>{{t common.remove}}</a>
+        {{/if}}
 	      <span class="help-inline">{{overriddenSCP.errorMessage}}</span>
 	    {{/if}}
     </div>

+ 4 - 0
ambari-web/app/templates/common/configs/service_config.hbs

@@ -114,7 +114,9 @@
                                 {{#if view.canEdit}}
 	                                {{#if isPropertyOverridable}}
                                     {{#if view.supportsHostOverrides}}
+                                      {{#if App.isAdmin}}
 	                                    <a class="action" {{action "createOverrideProperty" this target="view" }} ><i class="icon-plus-sign"></i>{{t common.override}}</a>
+                                      {{/if}}
                                     {{/if}}
 	                                {{/if}}
 	                                {{#unless cantBeUndone}}
@@ -123,7 +125,9 @@
 	                                  {{/if}}
 	                                {{/unless}}
 	                                {{#if isRemovable}}
+                                    {{#if App.isAdmin}}
 	                                    <a class="action" {{action "removeProperty" this target="view" }} ><i class="icon-minus-sign"></i>{{t common.remove}}</a>
+                                    {{/if}}
 	                                {{/if}}
                                 {{/if}}
                                   <span class="help-inline">{{errorMessage}}</span>