Browse Source

AMBARI-6750. edit repository input field + confirmation dialog esc. (Levgen G via xiwang)

Xi Wang 11 năm trước cách đây
mục cha
commit
c2568ef26e

+ 1 - 0
ambari-web/app/styles/application.less

@@ -6208,6 +6208,7 @@ i.icon-asterisks {
             width: 60%;
             .ember-text-field {
               width: 100%;
+              margin: -1px -1px -1px -2px;
             }
           }
           .url-text-td {

+ 10 - 6
ambari-web/app/views/main/admin/cluster.js

@@ -139,15 +139,19 @@ App.MainAdminClusterView = Em.View.extend({
     if (!targetRepo) {
       return;
     } else {
+      
+      var modalCloseHandler = function() {
+        this.hide();
+        targetRepo.set('baseUrl', data.data.Repositories.base_url);
+        targetRepo.set('originalBaseUrl', data.data.Repositories.base_url);
+        targetRepo.set('onEdit', false);
+      };
+
       App.ModalPopup.show({
         header: Em.I18n.t('admin.cluster.repositories.popup.header.success'),
         secondary: null,
-        onPrimary: function () {
-          this.hide();
-          targetRepo.set('baseUrl', data.data.Repositories.base_url);
-          targetRepo.set('originalBaseUrl', data.data.Repositories.base_url);
-          targetRepo.set('onEdit', false);
-        },
+        onPrimary: modalCloseHandler,
+        onClose: modalCloseHandler,
         message: Em.I18n.t('admin.cluster.repositories.popup.body.success'),
         bodyClass: Em.View.extend({
           template: Em.Handlebars.compile('<div class="alert alert-success">{{{message}}}</div>')