🎨 #12554

src/main/java/org/b3log/solo/service/UserMgmtService.java

@@ -48,7 +48,7 @@ import java.util.Set;
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
  * @author <a href="mailto:385321165@qq.com">DASHU</a>
  * @author <a href="https://github.com/nanolikeyou">nanolikeyou</a>
- * @version 1.1.0.14, Oct 5, 2018
+ * @version 1.1.0.15, Oct 19, 2018
  * @since 0.4.0
  */
 @Service
@@ -133,11 +133,8 @@ public class UserMgmtService {
             final boolean maybeHashed = HASHED_PASSWORD_LENGTH == userPassword.length();
             final String newHashedPassword = DigestUtils.md5Hex(userPassword);
             final String oldHashedPassword = oldUser.optString(User.USER_PASSWORD);
-
-            if (!"demo.b3log.org".equals(Latkes.getServerHost())) { // Skips the Solo Online Demo (http://demo.b3log.org)
-                if (!maybeHashed || (!oldHashedPassword.equals(userPassword) && !oldHashedPassword.equals(newHashedPassword))) {
-                    oldUser.put(User.USER_PASSWORD, newHashedPassword);
-                }
+            if (!maybeHashed || (!oldHashedPassword.equals(userPassword) && !oldHashedPassword.equals(newHashedPassword))) {
+                oldUser.put(User.USER_PASSWORD, newHashedPassword);
             }
 
             final String userRole = requestJSONObject.optString(User.USER_ROLE);

src/main/webapp/admin-user-list.ftl

@@ -24,7 +24,7 @@
 <div class="clear"></div>
 <div class="form form__no-table">
 ${addUserLabel}
-    <label for="userName">${commentName1Label}</label>
+    <label for="userName">${userName1Label}</label>
     <input id="userName" type="text"/>
     <label for="userEmail">${commentEmail1Label}</label>
     <input id="userEmail" type="text"/>
@@ -38,8 +38,7 @@ ${addUserLabel}
     <div class="clear"></div>
 </div>
 <div id="userUpdate" class="none form form__table">
-${updateUserLabel}
-    <label for="userNameUpdate">${commentName1Label}</label>
+    <label for="userNameUpdate">${userName1Label}</label>
     <input id="userNameUpdate" type="text"/>
     <label for="userEmailUpdate">${commentEmail1Label}</label>
     <input id="userEmailUpdate" type="text"/>

src/main/webapp/js/admin/latkeAdmin.js

@@ -3601,7 +3601,7 @@ admin.register["plugin-list"] = {
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.1.2.0, Sep 10, 2018
+ * @version 1.1.2.1, Oct 19, 2018
  */
 
 /* user-list 相关操作 */
@@ -3782,12 +3782,6 @@ admin.userList = {
                     "userRole": userRole
                 });
                 $userEmailUpdate.val(result.user.userEmail);
-                if ("adminRole" === userRole) {
-                    $userEmailUpdate.attr("disabled", "disabled");
-                } else {
-                    $userEmailUpdate.removeAttr("disabled");
-                }
-                
                 $("#userURLUpdate").val(result.user.userURL);
                 $("#userPasswordUpdate").val(result.user.userPassword);
                 $("#userAvatarUpdate").val(result.user.userAvatar);

src/main/webapp/js/admin/userList.js

@@ -20,7 +20,7 @@
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.1.2.0, Sep 10, 2018
+ * @version 1.1.2.1, Oct 19, 2018
  */
 
 /* user-list 相关操作 */
@@ -201,12 +201,6 @@ admin.userList = {
                     "userRole": userRole
                 });
                 $userEmailUpdate.val(result.user.userEmail);
-                if ("adminRole" === userRole) {
-                    $userEmailUpdate.attr("disabled", "disabled");
-                } else {
-                    $userEmailUpdate.removeAttr("disabled");
-                }
-                
                 $("#userURLUpdate").val(result.user.userURL);
                 $("#userPasswordUpdate").val(result.user.userPassword);
                 $("#userAvatarUpdate").val(result.user.userAvatar);