Repository: ambari Updated Branches: refs/heads/trunk b68b716a5 -> 378cf1366
AMBARI-8472. Hide Alerts control elements when non-admin user (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/378cf136 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/378cf136 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/378cf136 Branch: refs/heads/trunk Commit: 378cf13667c7b368f4cee564afe725343cc65961 Parents: b68b716 Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Fri Nov 28 13:45:55 2014 +0200 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Fri Nov 28 13:45:55 2014 +0200 ---------------------------------------------------------------------- ambari-web/app/templates/main/alerts.hbs | 29 ++++++----- .../main/alerts/definition_details.hbs | 51 +++++++++++--------- 2 files changed, 45 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/378cf136/ambari-web/app/templates/main/alerts.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts.hbs b/ambari-web/app/templates/main/alerts.hbs index b449666..ded942f 100644 --- a/ambari-web/app/templates/main/alerts.hbs +++ b/ambari-web/app/templates/main/alerts.hbs @@ -16,10 +16,11 @@ * limitations under the License. }} - -<div id="alert-actions-button" class="pull-left"> - {{view App.MainAlertDefinitionActionsView controllerBinding="App.router.mainAlertDefinitionActionsController"}} -</div> +{{#isAccessible ADMIN}} + <div id="alert-actions-button" class="pull-left"> + {{view App.MainAlertDefinitionActionsView controllerBinding="App.router.mainAlertDefinitionActionsController"}} + </div> +{{/isAccessible}} <div id="alert-groups-filter" class="pull-left advanced-header-table groups-filter"> {{view view.alertGroupFilterView}} @@ -58,16 +59,20 @@ <td class="last toggle-state-button"> {{#if alertDefinition.enabled}} {{t alerts.table.state.enabled}} - <a href="#" {{action "toggleState" alertDefinition target="controller"}} {{bindAttr class=":enable-disable-button alertDefinition.enabled:enabled:disabled"}} - {{bindAttr data-original-title="alerts.table.state.enabled.tooltip"}}> - <span class="icon-off"></span> - </a> + {{#isAccessible ADMIN}} + <a href="#" {{action "toggleState" alertDefinition target="controller"}} {{bindAttr class=":enable-disable-button alertDefinition.enabled:enabled:disabled"}} + {{bindAttr data-original-title="alerts.table.state.enabled.tooltip"}}> + <span class="icon-off"></span> + </a> + {{/isAccessible}} {{else}} {{t alerts.table.state.disabled}} - <a href="#" {{action "toggleState" alertDefinition target="controller"}} {{bindAttr class=":enable-disable-button alertDefinition.enabled:enabled:disabled"}} - {{bindAttr data-original-title="alerts.table.state.disabled.tooltip"}}> - <span class="icon-off"></span> - </a> + {{#isAccessible ADMIN}} + <a href="#" {{action "toggleState" alertDefinition target="controller"}} {{bindAttr class=":enable-disable-button alertDefinition.enabled:enabled:disabled"}} + {{bindAttr data-original-title="alerts.table.state.disabled.tooltip"}}> + <span class="icon-off"></span> + </a> + {{/isAccessible}} {{/if}} </td> </tr> http://git-wip-us.apache.org/repos/asf/ambari/blob/378cf136/ambari-web/app/templates/main/alerts/definition_details.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/definition_details.hbs b/ambari-web/app/templates/main/alerts/definition_details.hbs index 298ea56..fd17831 100644 --- a/ambari-web/app/templates/main/alerts/definition_details.hbs +++ b/ambari-web/app/templates/main/alerts/definition_details.hbs @@ -36,18 +36,20 @@ {{{controller.content.status}}} {{controller.content.label}} {{/if}} {{#unless controller.editing.label.isEditing}} - <a {{action edit controller.editing.label target="controller"}} class="edit-description-button"><i - class="icon-pencil"></i></a> + {{#isAccessible ADMIN}} + <a {{action edit controller.editing.label target="controller"}} class="edit-description-button"><i class="icon-pencil"></i></a> + {{/isAccessible}} {{/unless}} </div> - <div><a href="javascript:void(null)" data-toggle="modal" {{action back}}><i - class="icon-arrow-left"></i> {{t common.back}}</a></div> + <div><a href="javascript:void(null)" data-toggle="modal" {{action back}}><i class="icon-arrow-left"></i> {{t common.back}}</a></div> <div class="definition-details-block"> <strong>{{t common.description}}</strong> {{#unless controller.editing.description.isEditing}} - <a {{action edit controller.editing.description target="controller"}} class="pull-right edit-link"> - <strong>{{t common.edit}}</strong> - </a> + {{#isAccessible ADMIN}} + <a {{action edit controller.editing.description target="controller"}} class="pull-right edit-link"> + <strong>{{t common.edit}}</strong> + </a> + {{/isAccessible}} {{/unless}} <hr> {{#if controller.editing.description.isEditing}} @@ -55,8 +57,7 @@ {{view Em.TextArea valueBinding="controller.editing.description.value"}} </div> <div class="edit-buttons"> - <button {{action cancelEdit controller.editing.description target="controller"}} - class="btn">{{t common.cancel}}</button> + <button {{action cancelEdit controller.editing.description target="controller"}} class="btn">{{t common.cancel}}</button> <button {{bindAttr disabled="controller.editing.description.isError"}} {{action saveEdit controller.editing.description target="controller"}} class="btn btn-primary">{{t common.save}} </button> @@ -69,11 +70,13 @@ </div> <div class="definition-details-block"> <strong>{{t alerts.thresholds}}</strong> - {{#unless App.router.mainAlertDefinitionConfigsController.canEdit}} - <a {{action editConfigs target="App.router.mainAlertDefinitionConfigsController"}} class="pull-right edit-link"> - <strong>{{t common.edit}}</strong> - </a> - {{/unless}} + {{#isAccessible ADMIN}} + {{#unless App.router.mainAlertDefinitionConfigsController.canEdit}} + <a {{action editConfigs target="App.router.mainAlertDefinitionConfigsController"}} class="pull-right edit-link"> + <strong>{{t common.edit}}</strong> + </a> + {{/unless}} + {{/isAccessible}} <hr> {{view App.AlertDefinitionConfigsView contentBinding="view.controller.content" canEdit=false}} {{#if App.router.mainAlertDefinitionConfigsController.canEdit}} @@ -91,15 +94,17 @@ {{t common.service}}: <span class="label label-info">{{controller.content.service.displayName}}</span> </div> <div> - {{#if controller.content.enabled}} - <button {{action toggleState target="controller"}} class="btn btn-danger"><i - class="icon-power-off"></i> {{t alerts.definition.details.disable}}</button> - {{else}} - <button {{action toggleState target="controller"}} class="btn btn-success"><i - class="icon-power-off"></i> {{t alerts.definition.details.enable}}</button> - {{/if}} - <button {{action deleteAlertDefinition target="controller"}} class="btn btn-primary"><i - class="icon-trash"></i> {{t common.delete}}</button> + {{#isAccessible ADMIN}} + {{#if controller.content.enabled}} + <button {{action toggleState target="controller"}} class="btn btn-danger"><i + class="icon-power-off"></i> {{t alerts.definition.details.disable}}</button> + {{else}} + <button {{action toggleState target="controller"}} class="btn btn-success"><i + class="icon-power-off"></i> {{t alerts.definition.details.enable}}</button> + {{/if}} + <button {{action deleteAlertDefinition target="controller"}} class="btn btn-primary"><i + class="icon-trash"></i> {{t common.delete}}</button> + {{/isAccessible}} </div> <div class="properties-list"> <span>{{t common.type}}: {{controller.content.type}}</span>
