You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2013/11/27 16:58:41 UTC
git commit: AMBARI-3906 Installer wizard: Admin-> Settings link
should be hidden. (ababiichuk)
Updated Branches:
refs/heads/branch-1.4.2 7083e262b -> 11dbe90ed
AMBARI-3906 Installer wizard: Admin-> Settings link should be hidden. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/11dbe90e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/11dbe90e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/11dbe90e
Branch: refs/heads/branch-1.4.2
Commit: 11dbe90edd6d3c47014cb2c207d502ee39bf6db5
Parents: 7083e26
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Wed Nov 27 17:56:39 2013 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Wed Nov 27 17:56:39 2013 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/application.js | 5 +++--
ambari-web/app/controllers/installer.js | 2 ++
ambari-web/app/templates/application.hbs | 6 ++++--
ambari-web/app/views/main/admin/user/create.js | 3 +++
4 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/11dbe90e/ambari-web/app/controllers/application.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/application.js b/ambari-web/app/controllers/application.js
index ef72985..7fb36bc 100644
--- a/ambari-web/app/controllers/application.js
+++ b/ambari-web/app/controllers/application.js
@@ -51,8 +51,9 @@ App.ApplicationController = Em.Controller.extend({
});
return dfd.promise();
},
- persistKey: function () {
- var loginName = App.router.get('loginName');
+ persistKey: function (loginName) {
+ if (!loginName)
+ loginName = App.router.get('loginName');
return 'admin-settings-show-bg-' + loginName;
},
currentPrefObject: null,
http://git-wip-us.apache.org/repos/asf/ambari/blob/11dbe90e/ambari-web/app/controllers/installer.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/installer.js b/ambari-web/app/controllers/installer.js
index dbb0923..96e7b29 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -467,6 +467,8 @@ App.InstallerController = App.WizardController.extend({
finish: function () {
this.setCurrentStep('0');
this.clearStorageData();
+ var persists = App.router.get('applicationController').persistKey();
+ App.router.get('applicationController').postUserPref(persists,true);
},
setStepsEnable: function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/11dbe90e/ambari-web/app/templates/application.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/application.hbs b/ambari-web/app/templates/application.hbs
index 2eb986b..e33102b 100644
--- a/ambari-web/app/templates/application.hbs
+++ b/ambari-web/app/templates/application.hbs
@@ -44,8 +44,10 @@
{{App.router.loginName}} <span class="caret"></span>
</button>
<ul class="dropdown-menu">
- {{#if App.isAdmin}}
- <li><a href="" {{action showSettingsPopup target="controller"}}>{{t app.settings}}</a></li>
+ {{#if isClusterDataLoaded}}
+ {{#if App.isAdmin}}
+ <li><a href="" {{action showSettingsPopup target="controller"}}>{{t app.settings}}</a></li>
+ {{/if}}
{{/if}}
<li><a href="" {{action logoff}}>{{t app.signout}}</a></li>
</ul>
http://git-wip-us.apache.org/repos/asf/ambari/blob/11dbe90e/ambari-web/app/views/main/admin/user/create.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/user/create.js b/ambari-web/app/views/main/admin/user/create.js
index 8541bbe..82f3cfb 100644
--- a/ambari-web/app/views/main/admin/user/create.js
+++ b/ambari-web/app/views/main/admin/user/create.js
@@ -60,6 +60,9 @@ App.MainAdminUserCreateView = Em.View.extend({
this.hide();
}
});
+ var persists = App.router.get('applicationController').persistKey(form.getField("userName").get('value'));
+ App.router.get('applicationController').postUserPref(persists,true);
+
form.save();
App.router.transitionTo("allUsers");