Browse Source

AMBARI-15283. User authorization is broken (alexantonenko)

Alex Antonenko 9 years ago
parent
commit
0db3044e5f
1 changed files with 15 additions and 3 deletions
  1. 15 3
      ambari-web/app/router.js

+ 15 - 3
ambari-web/app/router.js

@@ -321,8 +321,8 @@ App.Router = Em.Router.extend({
         name: 'router.login.message',
         name: 'router.login.message',
         sender: self,
         sender: self,
         data: requestData,
         data: requestData,
-        success: 'showLoginMessage',
-        error: 'showLoginMessage'
+        success: 'showLoginMessageSuccessCallback',
+        error: 'showLoginMessageErrorCallback'
       });
       });
     });
     });
   },
   },
@@ -352,7 +352,7 @@ App.Router = Em.Router.extend({
    * @param {object} opt
    * @param {object} opt
    * @param {object} params
    * @param {object} params
    */
    */
-  showLoginMessage: function (data, opt, params){
+  showLoginMessageSuccessCallback: function (data, opt, params) {
     try {
     try {
       var response = JSON.parse(data.Settings.content.replace(/\n/g, "\\n"))
       var response = JSON.parse(data.Settings.content.replace(/\n/g, "\\n"))
     } catch (e) {
     } catch (e) {
@@ -401,6 +401,18 @@ App.Router = Em.Router.extend({
     }
     }
   },
   },
 
 
+  /**
+   * error callback of router.login.message
+   * @param {object} request
+   * @param {string} ajaxOptions
+   * @param {string} error
+   * @param {object} opt
+   * @param {object} params
+   */
+  showLoginMessageErrorCallback: function (request, ajaxOptions, error, opt, params) {
+    this.showLoginMessageSuccessCallback(null, opt, params);
+  },
+
   setClusterData: function (data, opt, params) {
   setClusterData: function (data, opt, params) {
     var
     var
       self = this,
       self = this,