You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2014/03/06 14:27:44 UTC

git commit: AMBARI-4971. Ambari Web UI broke after manually navigating to SQOOP configs page. (onechiporenko)

Repository: ambari
Updated Branches:
  refs/heads/trunk 6799d16f6 -> 195ee6900


AMBARI-4971. Ambari Web UI broke after manually navigating to SQOOP configs page. (onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/195ee690
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/195ee690
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/195ee690

Branch: refs/heads/trunk
Commit: 195ee69005071eb38c4858b25e0d3d1b77f57d2f
Parents: 6799d16
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Thu Mar 6 15:24:52 2014 +0200
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Thu Mar 6 15:24:52 2014 +0200

----------------------------------------------------------------------
 ambari-web/app/mappers/service_metrics_mapper.js | 9 +++++----
 ambari-web/app/routes/main.js                    | 8 +++++++-
 2 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/195ee690/ambari-web/app/mappers/service_metrics_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/service_metrics_mapper.js b/ambari-web/app/mappers/service_metrics_mapper.js
index 104c78d..805677e 100644
--- a/ambari-web/app/mappers/service_metrics_mapper.js
+++ b/ambari-web/app/mappers/service_metrics_mapper.js
@@ -281,11 +281,12 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
     var isSecondaryNamenode = hostComponents.findProperty('component_name', 'SECONDARY_NAMENODE');
     services.setEach('tool_tip_content', '');
     // set tooltip for client-only services
-    var clientOnlyServiceNames = ['TEZ', 'SQOOP', 'PIG'];
-    var clientOnlyServiceTooltip = Em.I18n.t('services.service.summary.clientOnlyService.ToolTip');
-    clientOnlyServiceNames.forEach( function(serviceName) {
+    var clientOnlyServiceNames = Em.A(['TEZ', 'SQOOP', 'PIG']);
+    clientOnlyServiceNames.forEach(function(serviceName) {
       var service = services.findProperty('ServiceInfo.service_name', serviceName);
-      service.tool_tip_content = clientOnlyServiceTooltip;
+      if (service) {
+        service.tool_tip_content = Em.I18n.t('services.service.summary.clientOnlyService.ToolTip');
+      }
     });
     hostComponents.forEach(function (hostComponent) {
       var service = services.findProperty('ServiceInfo.service_name', hostComponent.service_id);

http://git-wip-us.apache.org/repos/asf/ambari/blob/195ee690/ambari-web/app/routes/main.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js
index df0427f..42f3d6d 100644
--- a/ambari-web/app/routes/main.js
+++ b/ambari-web/app/routes/main.js
@@ -642,7 +642,13 @@ module.exports = Em.Route.extend({
         route: '/configs',
         connectOutlets: function (router, context) {
           var item = router.get('mainServiceItemController.content');
-          router.get('mainServiceItemController').connectOutlet('mainServiceInfoConfigs', item);
+          if (item.get('isConfigurable')) {
+            router.get('mainServiceItemController').connectOutlet('mainServiceInfoConfigs', item);
+          }
+          else {
+            // if service doesn't have configs redirect to summary
+            router.transitionTo('summary');
+          }
         },
         unroutePath: function (router, context) {
           var controller = router.get('mainServiceInfoConfigsController');