소스 검색

AMBARI-14899. UI part of rename Admin Setting API (alexantonenko)

Alex Antonenko 9 년 전
부모
커밋
079a5b3b12

+ 5 - 5
ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/loginActivities/LoginMessageMainCtrl.js

@@ -25,11 +25,11 @@ angular.module('ambariAdminConsole')
     $scope.status = false;
     $scope.motdExists = false;
     $scope.text = "";
-    $scope.buttonText = "Ok";
+    $scope.buttonText = "OK";
     $scope.submitDisabled = true;
 
-    $http.get('/api/v1/admin-settings/motd').then(function (res) {
-      var response = JSON.parse(res.data.AdminSettings.content);
+    $http.get('/api/v1/settings/motd').then(function (res) {
+      var response = JSON.parse(res.data.Settings.content);
       $scope.text = response.text ? response.text : "";
       $scope.buttonText = response.button ? response.button : "";
       $scope.status = response.status && response.status == "true" ? true : false;
@@ -53,7 +53,7 @@ angular.module('ambariAdminConsole')
     $scope.saveLoginMsg = function(targetUrl) {
       var method = $scope.motdExists ? 'PUT' : 'POST';
       var data = {
-        'AdminSettings' : {
+        'Settings' : {
           'content' : '{"text":"' + $scope.text + '", "button":"' + $scope.buttonText + '", "status":"' + $scope.status + '"}',
           'name' : 'motd',
           'setting_type' : 'ambari-server'
@@ -64,7 +64,7 @@ angular.module('ambariAdminConsole')
         $scope.submitDisabled = true;
         return $http({
           method: method,
-          url: '/api/v1/admin-settings/' + ($scope.motdExists ? 'motd' : ''),
+          url: '/api/v1/settings/' + ($scope.motdExists ? 'motd' : ''),
           data: data
         }).then(function successCallback() {
           $scope.motdExists = true;

+ 2 - 2
ambari-web/app/assets/data/settings/motd.json

@@ -1,6 +1,6 @@
 {
-  "href" : "/api/v1/admin-settings/motd",
-  "AdminSettings" : {
+  "href" : "/api/v1/settings/motd",
+  "Settings" : {
     "content" : "{\"text\":\"You are using test mode\", \"button\":\"\", \"status\":\"true\"}",
     "name" : "motd",
     "setting_type" : "ambari-server",

+ 1 - 1
ambari-web/app/router.js

@@ -363,7 +363,7 @@ App.Router = Em.Router.extend({
    * @param {object} data
    */
   showLoginMessage: function (data){
-    var response = JSON.parse(data.AdminSettings.content),
+    var response = JSON.parse(data.Settings.content),
       text = response.text ? response.text : "",
       buttonText = response.button ? response.button : Em.I18n.t('ok'),
       status = response.status && response.status == "true" ? true : false;

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

@@ -2089,7 +2089,7 @@ var urls = {
     'mock': '/data/clusters/info.json'
   },
   'router.login.message': {
-    'real': '/admin-settings/motd',
+    'real': '/settings/motd',
     'mock': '/data/settings/motd.json'
   },
   'router.logoff': {