MODADMIN-46 Фикс в редактировании пользователя

iondv · Apr 28, 2020 · c7a920c · c7a920c
1 parent 1f5061d
commit c7a920c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 /.idea/*
 /.git/*
 /node_modules/*
-/view/node_modules/*
+/view/static/node_modules/*
 /view/vendor/*
 /view/static/vendor/*
 /view/static/css/*.less.css

diff --git a/models/security/user.js b/models/security/user.js
@@ -61,11 +61,11 @@ module.exports = (getScope) => {
         delete data.login;
       }
       data.disabled = Boolean(data.disabled);
-      data.needPwdReset = true;
 
       let p0 = Promise.resolve();
       if (data.pwd) {
         p0 = getAccounts().setPassword(id, null, data.pwd);
+        data.needPwdReset = true;
         delete data.pwd;
       }
       return p0.then(() => getAccounts().set(id, data))