Repository: ambari Updated Branches: refs/heads/trunk 67cd9d9ee -> a8a723557
AMBARI-15670: Disable ability to open Edit Widget Wizard if Ambari Metrics is not installed (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a8a72355 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a8a72355 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a8a72355 Branch: refs/heads/trunk Commit: a8a72355798ed42e5705bfe83efb438dabd07292 Parents: 67cd9d9 Author: Aleksandr Kovalenko <akovale...@hortonworks.com> Authored: Fri Apr 1 17:59:08 2016 +0300 Committer: Aleksandr Kovalenko <akovale...@hortonworks.com> Committed: Fri Apr 1 19:26:58 2016 +0300 ---------------------------------------------------------------------- .../app/templates/common/widget/gauge_widget.hbs | 6 ++++-- .../app/templates/common/widget/graph_widget.hbs | 14 ++++++++------ .../app/templates/common/widget/number_widget.hbs | 16 +++++++++------- .../app/templates/common/widget/template_widget.hbs | 4 +++- 4 files changed, 24 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a8a72355/ambari-web/app/templates/common/widget/gauge_widget.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/widget/gauge_widget.hbs b/ambari-web/app/templates/common/widget/gauge_widget.hbs index 5e18584..16a03ee 100644 --- a/ambari-web/app/templates/common/widget/gauge_widget.hbs +++ b/ambari-web/app/templates/common/widget/gauge_widget.hbs @@ -22,14 +22,16 @@ <i class="icon-remove-sign icon-large"></i> </a> <div class="caption title span11">{{view.content.widgetName}}</div> - <div class="widget-icons"> + <div class="widget-icons"> + {{#if controller.isAmbariMetricsInstalled}} <a class="corner-icon pull-right" href="#" {{action editWidget target="view"}}> <i class="icon-edit"></i> </a> <a class="corner-icon pull-right" href="#" {{action cloneWidget target="view"}}> <i class="icon-copy"></i> </a> - </div> + {{/if}} + </div> <div class="content"> {{#if view.isUnavailable}} {{#if view.isOverflowed}} http://git-wip-us.apache.org/repos/asf/ambari/blob/a8a72355/ambari-web/app/templates/common/widget/graph_widget.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/widget/graph_widget.hbs b/ambari-web/app/templates/common/widget/graph_widget.hbs index a2c0c65..e92678a 100644 --- a/ambari-web/app/templates/common/widget/graph_widget.hbs +++ b/ambari-web/app/templates/common/widget/graph_widget.hbs @@ -26,12 +26,14 @@ <a {{bindAttr class="view.isExportButtonHidden:hidden :corner-icon :pull-right"}} href="#" {{action toggleFormatsList target="view"}}> <i class="icon-save"></i> </a> - <a class="corner-icon pull-right" href="#" {{action editWidget target="view"}}> - <i class="icon-edit"></i> - </a> - <a class="corner-icon pull-right" href="#" {{action cloneWidget target="view"}}> - <i class="icon-copy"></i> - </a> + {{#if controller.isAmbariMetricsInstalled}} + <a class="corner-icon pull-right" href="#" {{action editWidget target="view"}}> + <i class="icon-edit"></i> + </a> + <a class="corner-icon pull-right" href="#" {{action cloneWidget target="view"}}> + <i class="icon-copy"></i> + </a> + {{/if}} {{view view.exportMetricsMenuView}} </div> <div class="content"> {{view view.graphView}}</div> http://git-wip-us.apache.org/repos/asf/ambari/blob/a8a72355/ambari-web/app/templates/common/widget/number_widget.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/widget/number_widget.hbs b/ambari-web/app/templates/common/widget/number_widget.hbs index a3b1c6f..8932a7d 100644 --- a/ambari-web/app/templates/common/widget/number_widget.hbs +++ b/ambari-web/app/templates/common/widget/number_widget.hbs @@ -23,13 +23,15 @@ </a> <div class="caption title span11">{{view.content.widgetName}}</div> <div class="widget-icons"> - <a class="corner-icon pull-right" href="#" {{action editWidget target="view"}}> - <i class="icon-edit"></i> - </a> - <a class="corner-icon pull-right" href="#" {{action cloneWidget target="view"}}> - <i class="icon-copy"></i> - </a> - </div> + {{#if controller.isAmbariMetricsInstalled}} + <a class="corner-icon pull-right" href="#" {{action editWidget target="view"}}> + <i class="icon-edit"></i> + </a> + <a class="corner-icon pull-right" href="#" {{action cloneWidget target="view"}}> + <i class="icon-copy"></i> + </a> + {{/if}} + </div> <div {{bindAttr class="view.contentColor :content"}}>{{view.displayValue}}</div> {{#if view.content.description}} <div class="hidden-description"> http://git-wip-us.apache.org/repos/asf/ambari/blob/a8a72355/ambari-web/app/templates/common/widget/template_widget.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/widget/template_widget.hbs b/ambari-web/app/templates/common/widget/template_widget.hbs index 0382827..7b174de 100644 --- a/ambari-web/app/templates/common/widget/template_widget.hbs +++ b/ambari-web/app/templates/common/widget/template_widget.hbs @@ -22,13 +22,15 @@ <i class="icon-remove-sign icon-large"></i> </a> <div class="caption title span11">{{view.content.widgetName}}</div> - <div class="widget-icons"> + <div class="widget-icons"> + {{#if controller.isAmbariMetricsInstalled}} <a class="corner-icon pull-right" href="#" {{action editWidget target="view"}}> <i class="icon-edit"></i> </a> <a class="corner-icon pull-right" href="#" {{action cloneWidget target="view"}}> <i class="icon-copy"></i> </a> + {{/if}} </div> <div {{bindAttr class="view.contentColor :content"}}>{{{view.displayValue}}}</div> {{#if view.content.description}}