diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.java index 6d997a7108..844a97c7e2 100644 --- a/server-core/src/main/java/io/onedev/server/model/User.java +++ b/server-core/src/main/java/io/onedev/server/model/User.java @@ -209,6 +209,18 @@ public class User extends AbstractEntity implements AuthenticationInfo { @Cache(usage=CacheConcurrencyStrategy.READ_WRITE) private Collection pullRequestMentions = new ArrayList<>(); + @OneToMany(mappedBy=IssueDescriptionRevision.PROP_USER, cascade=CascadeType.REMOVE) + private Collection issueDescriptionRevisions = new ArrayList<>(); + + @OneToMany(mappedBy=PullRequestDescriptionRevision.PROP_USER, cascade=CascadeType.REMOVE) + private Collection pullRequestDescriptionRevisions = new ArrayList<>(); + + @OneToMany(mappedBy=IssueCommentRevision.PROP_USER, cascade=CascadeType.REMOVE) + private Collection issueCommentRevisions = new ArrayList<>(); + + @OneToMany(mappedBy=PullRequestCommentRevision.PROP_USER, cascade=CascadeType.REMOVE) + private Collection pullRequestCommentRevisions = new ArrayList<>(); + @JsonIgnore @Lob @Column(nullable=false, length=65535) diff --git a/server-core/src/main/java/io/onedev/server/model/support/CommentRevision.java b/server-core/src/main/java/io/onedev/server/model/support/CommentRevision.java index b0a4a54da1..7fd6c7a134 100644 --- a/server-core/src/main/java/io/onedev/server/model/support/CommentRevision.java +++ b/server-core/src/main/java/io/onedev/server/model/support/CommentRevision.java @@ -18,6 +18,8 @@ public abstract class CommentRevision extends AbstractEntity { private static final long serialVersionUID = 1L; + public static final String PROP_USER = "user"; + public static final int MAX_CONTENT_LEN = 100000; @ManyToOne(fetch=FetchType.LAZY) diff --git a/server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.java b/server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.java index 885585c727..baf49ea104 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.java +++ b/server-core/src/main/java/io/onedev/server/web/page/user/profile/UserProfilePage.java @@ -11,7 +11,10 @@ import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.request.cycle.RequestCycle; 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.security.SecurityUtils; import io.onedev.server.util.DateRange; import io.onedev.server.web.component.user.profile.UserProfilePanel; import io.onedev.server.web.page.user.UserPage; @@ -32,7 +35,8 @@ public class UserProfilePage extends UserPage { @Override protected boolean isPermitted() { - return true; + return SecurityUtils.getAuthUser() != null + || OneDev.getInstance(SettingManager.class).getSecuritySetting().isEnableAnonymousAccess(); } @Override