Просмотр исходного кода

AMBARI-15206. Issues with Login Message dialog Round #3 (alexantonenko)

Alex Antonenko 9 лет назад
Родитель
Сommit
afea5a578a

+ 8 - 7
ambari-admin/src/main/resources/ui/admin-web/app/views/loginActivities/loginMessage.html

@@ -32,13 +32,14 @@
           <label class="col-sm-2 control-label">{{'common.loginActivities.message' | translate}}</label>
           <div class="col-sm-10">
             <textarea type="text"
-                 class="form-control"
-                 name="login_text"
-                 placeholder="{{'common.loginActivities.loginMessage.placeholder' | translate}}"
-                 ng-model="text"
-                 ng-change="inputChangeEvent()"
-                 ng-disabled="!status"
-                 autocomplete="off">
+                      rows="4"
+                      class="form-control"
+                      name="login_text"
+                      placeholder="{{'common.loginActivities.loginMessage.placeholder' | translate}}"
+                      ng-model="text"
+                      ng-change="inputChangeEvent()"
+                      ng-disabled="!status"
+                      autocomplete="off">
             </textarea>
             <div class="alert alert-danger top-margin" ng-show="form.login_text.$error.pattern && form.submitted">
              {{'common.loginActivities.onlySimpleChars' | translate}}

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

@@ -393,11 +393,11 @@ App.Router = Em.Router.extend({
         onClose: function () {
           self.setClusterData(data, opt, params);
           this.hide();
-        },
-        didInsertElement: function () {
-          this.fitHeight();
         }
       });
+    }else{
+      this.setClusterData(data, opt, params);
+      return false;
     }
   },