archive-gh-me/onedev
1
0
Fork 0
mirror of https://github.com/theonedev/onedev.git synced 2025-12-08 18:26:30 +00:00
Code Issues Projects Releases Wiki Activity

fix: Error when deleting a user (OD-2543)

Browse Source
This commit is contained in:
Robin Shen 2025-09-01 21:46:55 +08:00
parent f717f5ecd8
commit 9c1373442b
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server-core/src/main/java/io/onedev/server/model/User.java
View File

@ -209,6 +209,18 @@ public class User extends AbstractEntity implements AuthenticationInfo {
@Cache(usage=CacheConcurrencyStrategy.READ_WRITE) @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
private Collection<PullRequestMention> pullRequestMentions = new ArrayList<>(); private Collection<PullRequestMention> pullRequestMentions = new ArrayList<>();
@OneToMany(mappedBy=IssueDescriptionRevision.PROP_USER, cascade=CascadeType.REMOVE)
private Collection<IssueDescriptionRevision> issueDescriptionRevisions = new ArrayList<>();
@OneToMany(mappedBy=PullRequestDescriptionRevision.PROP_USER, cascade=CascadeType.REMOVE)
private Collection<PullRequestDescriptionRevision> pullRequestDescriptionRevisions = new ArrayList<>();
@OneToMany(mappedBy=IssueCommentRevision.PROP_USER, cascade=CascadeType.REMOVE)
private Collection<IssueCommentRevision> issueCommentRevisions = new ArrayList<>();
@OneToMany(mappedBy=PullRequestCommentRevision.PROP_USER, cascade=CascadeType.REMOVE)
private Collection<PullRequestCommentRevision> pullRequestCommentRevisions = new ArrayList<>();
@JsonIgnore @JsonIgnore
@Lob @Lob
@Column(nullable=false, length=65535) @Column(nullable=false, length=65535)

2
server-core/src/main/java/io/onedev/server/model/support/CommentRevision.java
View File

@ -18,6 +18,8 @@ public abstract class CommentRevision extends AbstractEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public static final String PROP_USER = "user";
public static final int MAX_CONTENT_LEN = 100000; public static final int MAX_CONTENT_LEN = 100000;
@ManyToOne(fetch=FetchType.LAZY) @ManyToOne(fetch=FetchType.LAZY)

6
server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.java
View File

@ -11,7 +11,10 @@ import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.User; import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateRange; import io.onedev.server.util.DateRange;
import io.onedev.server.web.component.user.profile.UserProfilePanel; import io.onedev.server.web.component.user.profile.UserProfilePanel;
import io.onedev.server.web.page.user.UserPage; import io.onedev.server.web.page.user.UserPage;
@ -32,7 +35,8 @@ public class UserProfilePage extends UserPage {
@Override @Override
protected boolean isPermitted() { protected boolean isPermitted() {
return true; return SecurityUtils.getAuthUser() != null
|| OneDev.getInstance(SettingManager.class).getSecuritySetting().isEnableAnonymousAccess();
} }
@Override @Override