feat: fix the top Navbar UI is broken issue (#3000 )

feat: Revert "feat: fix cannot create "/files" folder issue in local file storage provider in Docker" (#2997 )
This reverts commit e228045e37.
2025-08-06 04:48:42 +08:00 · 2024-06-09 17:05:04 +08:00 · 2024-06-06 11:09:02 +08:00 · 2024-06-06 10:49:56 +08:00 · 2024-06-04 13:32:13 +08:00
2 changed files with 13 additions and 2 deletions
--- a/controllers/user.go
+++ b/controllers/user.go
@@ -509,10 +509,21 @@ func (c *ApiController) SetPassword() {
 		return
 	}

+	organization, err := object.GetOrganizationByUser(targetUser)
+	if err != nil {
+		c.ResponseError(err.Error())
+		return
+	}
+	if organization == nil {
+		c.ResponseError(fmt.Sprintf(c.T("the organization: %s is not found"), targetUser.Owner))
+		return
+	}
+
 	targetUser.Password = newPassword
+	targetUser.UpdateUserPassword(organization)
 	targetUser.NeedUpdatePassword = false

-	_, err = object.UpdateUser(userId, targetUser, []string{"password", "need_update_password"}, false)
+	_, err = object.UpdateUser(userId, targetUser, []string{"password", "need_update_password", "password_type"}, false)
 	if err != nil {
 		c.ResponseError(err.Error())
 		return
--- a/web/src/ManagementPage.js
+++ b/web/src/ManagementPage.js
@@ -411,7 +411,7 @@ function ManagementPage(props) {
    return Setting.isMobile() || window.location.pathname.startsWith("/trees");
  }

-  const menuStyleRight = Setting.isAdminUser(props.account) && !Setting.isMobile() ? "calc(180px + 280px)" : "280px";
+  const menuStyleRight = Setting.isAdminUser(props.account) && !Setting.isMobile() ? "calc(180px + 280px)" : "320px";

  const onClose = () => {
    setMenuVisible(false);
Author	SHA1	Message	Date
ailiujiarui	4cc2120fed	feat: fix the top Navbar UI is broken issue (#3000 )	2024-06-09 17:05:04 +08:00
Yang Luo	93b0f52f26	feat: Revert "feat: fix cannot create "/files" folder issue in local file storage provider in Docker" (#2997 ) This reverts commit `e228045e37`.	2024-06-06 11:09:02 +08:00
DacongDA	e228045e37	feat: fix cannot create "/files" folder issue in local file storage provider in Docker (#2994 )	2024-06-06 10:49:56 +08:00
DacongDA	6b8c24e1f0	feat: fix password not encrypted issue in SetPassword() API (#2990 ) * fix: fix password not encrypted in set password and password type not changed * Update user.go --------- Co-authored-by: Yang Luo <hsluoyz@qq.com>	2024-06-04 13:32:13 +08:00