浏览代码

AMBARI-3906 Installer wizard: Admin-> Settings link should be hidden. (ababiichuk)

aBabiichuk 11 年之前
父节点
当前提交
fe9d517e59

+ 3 - 2
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,

+ 2 - 0
ambari-web/app/controllers/installer.js

@@ -477,6 +477,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 () {

+ 4 - 2
ambari-web/app/templates/application.hbs

@@ -44,8 +44,10 @@
                 {{App.router.loginName}}&nbsp;<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>

+ 3 - 0
ambari-web/app/views/main/admin/user/create.js

@@ -62,6 +62,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");