From 2ccb521e42277972921f112a963ac03232fcbb84 Mon Sep 17 00:00:00 2001
From: kunw <kunw@vmware.com>
Date: Wed, 16 Nov 2016 17:54:47 +0800
Subject: [PATCH] Updates for optimizing interaction with sign-in action.

---
 .../js/components/sign-in/sign-in.directive.js     | 14 +++++++++-----
 .../js/services/i18n/locale_messages_en-US.js      |  1 +
 .../js/services/i18n/locale_messages_zh-CN.js      |  3 ++-
 src/ui/views/sign-in.htm                           | 12 ++----------
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/ui/static/resources/js/components/sign-in/sign-in.directive.js b/src/ui/static/resources/js/components/sign-in/sign-in.directive.js
index 885239cfd..d95017571 100644
--- a/src/ui/static/resources/js/components/sign-in/sign-in.directive.js
+++ b/src/ui/static/resources/js/components/sign-in/sign-in.directive.js
@@ -36,20 +36,24 @@
     vm.doLogOut = doLogOut;
        
     vm.signInTIP = false;
-    
+        
     function reset() {
       vm.hasError = false;
       vm.errorMessage = '';
     } 
-      
-    function doSignIn(user) {  
-      if(user && angular.isDefined(user.principal) && angular.isDefined(user.password)) {
+          
+    function doSignIn(user) {    
+      if($scope.user.principal.length === 0  || $scope.user.password.length === 0) {
+        vm.hasError = true;
+        vm.errorMessage = 'username_and_password_are_required';        
+      } 
+      if(user.principal && user.password) {
         vm.lastUrl = getParameterByName('last_url', $location.absUrl());
         vm.signInTIP = true;
         SignInService(user.principal, user.password)
           .success(signedInSuccess)
           .error(signedInFailed);
-      }
+      }    
     }
     
     function signedInSuccess(data, status) {
diff --git a/src/ui/static/resources/js/services/i18n/locale_messages_en-US.js b/src/ui/static/resources/js/services/i18n/locale_messages_en-US.js
index f13f5088e..6194ed786 100644
--- a/src/ui/static/resources/js/services/i18n/locale_messages_en-US.js
+++ b/src/ui/static/resources/js/services/i18n/locale_messages_en-US.js
@@ -125,6 +125,7 @@ var locale_messages = {
   'username_already_exist': 'Username already exist.',
   'username_does_not_exist': 'Username does not exist.',
   'username_or_password_is_incorrect': 'Username or password is incorrect',
+  'username_and_password_are_required': 'Both username and password are required.',
   'username_email': 'Username/Email',
   'project_name_is_required': 'Project name is required',
   'project_already_exist': 'Project already exist',
diff --git a/src/ui/static/resources/js/services/i18n/locale_messages_zh-CN.js b/src/ui/static/resources/js/services/i18n/locale_messages_zh-CN.js
index 23d8bab89..d1a267f45 100644
--- a/src/ui/static/resources/js/services/i18n/locale_messages_zh-CN.js
+++ b/src/ui/static/resources/js/services/i18n/locale_messages_zh-CN.js
@@ -125,6 +125,7 @@ var locale_messages = {
   'username_already_exist': '用户名已存在。',
   'username_does_not_exist': '用户名不存在。',
   'username_or_password_is_incorrect': '用户名或密码不正确。',
+  'username_and_password_are_required': '用户名和密码为必填项。',
   'username_email': '用户名/邮箱',
   'project_name_is_required': '项目名称为必填项。',
   'project_already_exist': '项目已存在。',
@@ -183,7 +184,7 @@ var locale_messages = {
   'name_is_required': '名称为必填项',
   'name_is_too_long': '名称长度超出限制。（最长为20个字符）',
   'description_is_too_long': '描述内容长度超出限制。',
-  'general_setting': '一般设置',
+  'general_setting':  '一般设置',
   'destination_setting': '目标设置',
   'endpoint': '目标URL',
   'endpoint_is_required': '目标URL为必填项。',
diff --git a/src/ui/views/sign-in.htm b/src/ui/views/sign-in.htm
index 50c503844..71b39fac6 100644
--- a/src/ui/views/sign-in.htm
+++ b/src/ui/views/sign-in.htm
@@ -23,21 +23,13 @@
 <form name="form" class="form-horizontal css-form" novalidate autocomplete="off">
   <div class="form-group"> 
     <div class="col-sm-offset-1 col-sm-10">
-      <input id="username"  type="text" class="form-control" placeholder="// 'username_email' | tr //" name="uPrincipal" ng-change="vm.reset()" ng-model="user.principal" required>
-      <div class="error-message">
-        <div ng-messages="form.$submitted && form.uPrincipal.$error">
-          <span ng-message="required">// 'username_is_required' | tr //</span>
-        </div>
-      </div>
+      <input id="username"  type="text" class="form-control" placeholder="// 'username_email' | tr //" name="uPrincipal" ng-change="vm.reset()" ng-model="user.principal">
     </div>
   </div>
   <div class="form-group">
     <div class="col-sm-offset-1 col-sm-10">
-      <input type="password" class="form-control" placeholder="// 'password' | tr //" name="uPassword" ng-change="vm.reset()" ng-model="user.password" required>
+      <input type="password" class="form-control" placeholder="// 'password' | tr //" name="uPassword" ng-change="vm.reset()" ng-model="user.password">
       <div class="error-message">
-        <div ng-messages="form.$submitted && form.uPassword.$error">
-          <span ng-message="required">// 'password_is_required' | tr //</span>
-        </div>
         <span ng-show="vm.hasError">// vm.errorMessage | tr //</span>
       </div>
     </div>