Repository: ambari Updated Branches: refs/heads/trunk 8e835618b -> 17f764c00
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/17f764c0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/17f764c0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/17f764c0 Branch: refs/heads/trunk Commit: 17f764c00c56c0e2ad12eb18ddb4af09511acbd7 Parents: d69dce9 Author: ababiichuk <[email protected]> Authored: Fri May 27 18:21:17 2016 +0300 Committer: ababiichuk <[email protected]> Committed: Mon May 30 12:24:36 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/17f764c0/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); });
