Ver código fonte

AMBARI-4356. Test mode: unable to load mirroring page. (akovalenko)

Aleksandr Kovalenko 11 anos atrás
pai
commit
0a3e265183

+ 1 - 0
ambari-web/app/assets/data/user_settings/admin_settings_show_bg.json

@@ -0,0 +1 @@
+true

+ 1 - 0
ambari-web/app/assets/data/user_settings/pagination_displayLength.json

@@ -0,0 +1 @@
+"10"

+ 0 - 1
ambari-web/app/assets/data/user_settings/user_pref.json

@@ -1 +0,0 @@
-true

+ 3 - 0
ambari-web/app/controllers/application.js

@@ -52,6 +52,9 @@ App.ApplicationController = Em.Controller.extend({
     return dfd.promise();
     return dfd.promise();
   },
   },
   persistKey: function (loginName) {
   persistKey: function (loginName) {
+    if (App.get('testMode')) {
+      return 'admin_settings_show_bg';
+    }
     if (!loginName)
     if (!loginName)
       loginName = App.router.get('loginName');
       loginName = App.router.get('loginName');
     return 'admin-settings-show-bg-' + loginName;
     return 'admin-settings-show-bg-' + loginName;

+ 1 - 1
ambari-web/app/utils/ajax.js

@@ -658,7 +658,7 @@ var urls = {
   },
   },
   'settings.get.user_pref': {
   'settings.get.user_pref': {
     'real': '/persist/{key}',
     'real': '/persist/{key}',
-    'mock': '/data/user_settings/user_pref.json'
+    'mock': '/data/user_settings/{key}.json'
   },
   },
   'settings.post.user_pref': {
   'settings.post.user_pref': {
     'real': '/persist',
     'real': '/persist',

+ 3 - 0
ambari-web/app/views/common/table_view.js

@@ -102,6 +102,9 @@ App.TableView = Em.View.extend({
    * @returns {String}
    * @returns {String}
    */
    */
   displayLengthKey: function (loginName) {
   displayLengthKey: function (loginName) {
+    if (App.get('testMode')) {
+      return 'pagination_displayLength';
+    }
     loginName = loginName ? loginName : App.router.get('loginName');
     loginName = loginName ? loginName : App.router.get('loginName');
     return this.get('controller.name') + '-pagination-displayLength-' + loginName;
     return this.get('controller.name') + '-pagination-displayLength-' + loginName;
   },
   },