llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-05-23 02:35:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix normal user my-account page blank bug

Browse Source
This commit is contained in:
Yang Luo 2024-03-06 01:06:15 +08:00
parent 92b6fda0f6
commit fbdd5a926d
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
object/application.go
View File

@ -469,14 +469,24 @@ func GetMaskedApplication(application *Application, userId string) *Application
application.FailedSigninFrozenTime = DefaultFailedSigninFrozenTime application.FailedSigninFrozenTime = DefaultFailedSigninFrozenTime
} }
isOrgUser := false
if userId != "" { if userId != "" {
if isUserIdGlobalAdmin(userId) { if isUserIdGlobalAdmin(userId) {
return application return application
} }
user, _ := GetUser(userId) user, err := GetUser(userId)
if user != nil && user.IsApplicationAdmin(application) { if err != nil {
return application panic(err)
}
if user != nil {
if user.IsApplicationAdmin(application) {
return application
}
if user.Owner == application.Organization {
isOrgUser = true
}
} }
} }
@ -519,8 +529,11 @@ func GetMaskedApplication(application *Application, userId string) *Application
application.OrganizationObj.InitScore = -1 application.OrganizationObj.InitScore = -1
application.OrganizationObj.EnableSoftDeletion = false application.OrganizationObj.EnableSoftDeletion = false
application.OrganizationObj.IsProfilePublic = false application.OrganizationObj.IsProfilePublic = false
application.OrganizationObj.MfaItems = nil
application.OrganizationObj.AccountItems = nil if !isOrgUser {
application.OrganizationObj.MfaItems = nil
application.OrganizationObj.AccountItems = nil
}
} }
return application return application

6
web/src/UserEditPage.js
View File

@ -64,7 +64,9 @@ class UserEditPage extends React.Component {
UNSAFE_componentWillMount() { UNSAFE_componentWillMount() {
this.getUser(); this.getUser();
this.getOrganizations(); if (Setting.isLocalAdminUser(this.props.account)) {
this.getOrganizations();
}
this.getApplicationsByOrganization(this.state.organizationName); this.getApplicationsByOrganization(this.state.organizationName);
this.getUserApplication(); this.getUserApplication();
this.setReturnUrl(); this.setReturnUrl();
@ -1001,7 +1003,7 @@ class UserEditPage extends React.Component {
<div style={{verticalAlign: "middle", marginBottom: 10}}>{`(${i18next.t("general:empty")})`}</div> <div style={{verticalAlign: "middle", marginBottom: 10}}>{`(${i18next.t("general:empty")})`}</div>
</Col> </Col>
} }
<CropperDivModal disabled={disabled} tag={tag} setTitle={set} buttonText={`${title}...`} title={title} user={this.state.user} organization={this.state.organizations.find(organization => organization.name === this.state.organizationName)} /> <CropperDivModal disabled={disabled} tag={tag} setTitle={set} buttonText={`${title}...`} title={title} user={this.state.user} organization={this.getUserOrganization()} />
</Col> </Col>
); );
} }