You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2013/03/07 20:27:42 UTC
svn commit: r1454034 - in /incubator/ambari/trunk: CHANGES.txt
ambari-web/app/controllers/main/admin/security/add/step3.js
ambari-web/app/routes/add_security.js
Author: jaimin
Date: Thu Mar 7 19:27:42 2013
New Revision: 1454034
URL: http://svn.apache.org/r1454034
Log:
AMBARI-1577. Apply stage of security wizard throws javascript error for loadStep function. (jaimin)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step3.js
incubator/ambari/trunk/ambari-web/app/routes/add_security.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1454034&r1=1454033&r2=1454034&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Mar 7 19:27:42 2013
@@ -426,6 +426,9 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1577. Apply stage of security wizard throws javascript error
+ for loadStep function. (jaimin)
+
AMBARI-1575. Service should be shown red when any of its master component
is in START_FAILED status. (jaimin)
Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step3.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step3.js?rev=1454034&r1=1454033&r2=1454034&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step3.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step3.js Thu Mar 7 19:27:42 2013
@@ -33,7 +33,7 @@ App.MainAdminSecurityAddStep3Controller
this.get('stages').clear();
},
- loadStep1: function () {
+ loadStep: function () {
this.clearStep();
this.loadStages();
this.addInfoToStages();
Modified: incubator/ambari/trunk/ambari-web/app/routes/add_security.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/routes/add_security.js?rev=1454034&r1=1454033&r2=1454034&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/routes/add_security.js (original)
+++ incubator/ambari/trunk/ambari-web/app/routes/add_security.js Thu Mar 7 19:27:42 2013
@@ -116,10 +116,8 @@ module.exports = Em.Route.extend({
},
back: Em.Router.transitionTo('step2'),
done: function (router, context) {
- //Logic on completion of the wizard
- //set stage to stage2 of step3
router.get('mainAdminSecurityController').setAddSecurityWizardStatus(null);
- router.transitionTo('adminSecurity.index');
+ $(context.currentTarget).parents("#modal").find(".close").trigger('click');
}
}),