ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject [1/3] ambari git commit: AMBARI-16930 Message text is missing in EU wizard screens that require manual intervention. (ababiichuk)
Date Mon, 30 May 2016 09:27:18 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 615133d75 -> 97ff55232


AMBARI-16930 Message text is missing in EU wizard screens that require manual intervention.
(ababiichuk)


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

Branch: refs/heads/branch-2.4
Commit: a4a4e6e6e490758b646cd52e67992b16282202b5
Parents: 615133d
Author: ababiichuk <ababiichuk@hortonworks.com>
Authored: Fri May 27 18:21:17 2016 +0300
Committer: ababiichuk <ababiichuk@hortonworks.com>
Committed: Mon May 30 12:26:00 2016 +0300

----------------------------------------------------------------------
 .../main/admin/stack_and_upgrade_controller.js  | 27 ++++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a4a4e6e6/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index 53fdc03..e09b4b0 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -427,20 +427,19 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
       newGroup.upgrade_items.forEach(function (item) {
         var oldItem = App.upgradeEntity.create({type: 'ITEM'}, item.UpgradeItem);
         var status = oldItem.get('status');
-        if ('HOLDING' == status){
-          //manualItem
-          var text = oldItem.get('text');
-          try {
-            var messageArray = $.parseJSON(text)
-            var messages = [];
-            for(var i = 0; i < messageArray.length; i ++){
-              var aMessageObj = messageArray[i];
-              messages.push(aMessageObj.message);
-            }
-            oldItem.set('messages', messages)
-            oldItem.set('text', messages.join(' '))
-          } catch (err){}
-        }
+        var text = oldItem.get('text');
+
+        try {
+          var messageArray = $.parseJSON(text);
+          var messages = [];
+          for(var i = 0; i < messageArray.length; i ++){
+            var aMessageObj = messageArray[i];
+            messages.push(aMessageObj.message);
+          }
+          oldItem.set('messages', messages);
+          oldItem.set('text', messages.join(' '));
+        } catch (err){}
+
         oldItem.set('tasks', []);
         upgradeItems.pushObject(oldItem);
       });


Mime
View raw message