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

Merge branch 'fix/x_component_Profile' into 'develop'

Merge of fix/x_component_Profile to develop

See merge request o2oa/o2oa!66
胡起 5 лет назад
Родитель
Сommit
902c1275a7
1 измененных файлов с 3 добавлено и 0 удалено
  1. 3 0
      o2web/source/x_component_Profile/Main.js

+ 3 - 0
o2web/source/x_component_Profile/Main.js

@@ -867,11 +867,14 @@ MWF.xApplication.Profile.Main = new Class({
         var oldPassword = this.oldPasswordInputNode.get("value");
         var password = this.passwordInputNode.get("value");
         var morePassword = this.morePasswordInputNode.get("value");
+        var remindNode = this.contentNode.getElement(".o2_profile_passwordWarmming");
 
         if (password!=morePassword){
             this.notice(this.lp.passwordNotMatch, "error");
             this.passwordInputNode.setStyles(this.css.inforContentInputNode_error);
             this.morePasswordInputNode.setStyles(this.css.inforContentInputNode_error);
+        }else if(null||remindNode){
+            this.notice(remindNode.get("text"), "error");
         }else{
             this.action.changePassword(oldPassword, password, morePassword, function(){
                 this.oldPasswordInputNode.set("value", "");