Skip to content

The Unified and Autonomous Development Platform

feat: Enable email notification for self updates/creation (OD-1688)

Robin Shen2157e09f2af5
diff --git a/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java
index d73c1bdcc4..1928fc66a2 100644
--- a/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java
+++ b/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java
@@ -78,6 +78,8 @@ import java.util.*;
import java.util.stream.Collectors;
import static com.google.common.base.Throwables.getStackTraceAsString;
+import static io.onedev.server.model.User.PROP_GUEST;
+import static io.onedev.server.model.User.PROP_NOTIFY_OWN_EVENTS;
import static io.onedev.server.persistence.PersistenceUtils.tableExists;
import static org.unbescape.html.HtmlEscape.escapeHtml5;
@@ -643,7 +645,7 @@ public class DefaultDataManager implements DataManager, Serializable {
if (validator.validate(bean).isEmpty()) {
createRoot(bean);
} else {
- manualConfigs.add(new ManualConfig("Create Administrator Account", null, bean, Sets.newHashSet(User.PROP_GUEST)) {
+ manualConfigs.add(new ManualConfig("Create Administrator Account", null, bean, Sets.newHashSet(PROP_GUEST, PROP_NOTIFY_OWN_EVENTS)) {
@Override
public void complete() {
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
index 5f8a3483ae..9699560073 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
@@ -6820,5 +6820,16 @@ public class DataMigrator {
historyElement.addElement("duration").setText(history.getDuration().toString());
return historyElement;
}
+
+ private void migrate172(File dataDir, Stack<Integer> versions) {
+ for (File file : dataDir.listFiles()) {
+ if (file.getName().startsWith("Users.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements())
+ element.addElement("notifyOwnEvents").setText("false");
+ dom.writeToFile(file, false);
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/event/project/build/BuildEvent.java b/server-core/src/main/java/io/onedev/server/event/project/build/BuildEvent.java
index f9b12551fe..228058a9e4 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/build/BuildEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/build/BuildEvent.java
@@ -13,13 +13,15 @@ import io.onedev.server.model.User;
import io.onedev.server.util.CommitAware;
import io.onedev.server.util.ProjectScopedCommit;
+import javax.annotation.Nullable;
+
public abstract class BuildEvent extends ProjectEvent implements CommitAware {
private static final long serialVersionUID = 1L;
private Long buildId;
- public BuildEvent(User user, Date date, Build build) {
+ public BuildEvent(@Nullable User user, Date date, Build build) {
super(user, date, build.getProject());
buildId = build.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/event/project/pack/PackEvent.java b/server-core/src/main/java/io/onedev/server/event/project/pack/PackEvent.java
index dd3b9b5a0c..6d1d578c88 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/pack/PackEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/pack/PackEvent.java
@@ -17,8 +17,8 @@ public abstract class PackEvent extends ProjectEvent {
private final Long packId;
- public PackEvent(User user, Date date, Pack pack) {
- super(user, date, pack.getProject());
+ public PackEvent(Date date, Pack pack) {
+ super(null, date, pack.getProject());
packId = pack.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/event/project/pack/PackPublished.java b/server-core/src/main/java/io/onedev/server/event/project/pack/PackPublished.java
index e842eac34a..62c9a50626 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/pack/PackPublished.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/pack/PackPublished.java
@@ -7,7 +7,7 @@ public class PackPublished extends PackEvent {
private static final long serialVersionUID = 1L;
public PackPublished(Pack pack) {
- super(null, pack.getPublishDate(), pack);
+ super(pack.getPublishDate(), pack);
}
@Override
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 ad7de458c4..0b57c1e6aa 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
@@ -75,6 +75,8 @@ public class User extends AbstractEntity implements AuthenticationInfo {
public static final String PROP_GUEST = "guest";
+ public static final String PROP_NOTIFY_OWN_EVENTS = "notifyOwnEvents";
+
private static ThreadLocal<Stack<User>> stack = new ThreadLocal<Stack<User>>() {
@Override
@@ -100,6 +102,8 @@ public class User extends AbstractEntity implements AuthenticationInfo {
private boolean guest;
+ private boolean notifyOwnEvents;
+
@JsonIgnore
@Lob
@Column(length=65535)
@@ -567,6 +571,15 @@ public class User extends AbstractEntity implements AuthenticationInfo {
this.guest = guest;
}
+ @Editable(order=400, name="Notify Own Events", description = "Whether or not to send notifications for events generated by yourself")
+ public boolean isNotifyOwnEvents() {
+ return notifyOwnEvents;
+ }
+
+ public void setNotifyOwnEvents(boolean sendOwnEvents) {
+ this.notifyOwnEvents = sendOwnEvents;
+ }
+
public boolean isEffectiveGuest() {
return guest && !isRoot() && !isSystem();
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
index 51740a0c5c..cd8a059b15 100644
--- a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
@@ -131,6 +131,11 @@ public class BuildNotificationManager extends AbstractNotificationManager {
Build build = event.getBuild();
Collection<String> notifyEmails = new HashSet<>();
+ if (event.getUser() != null && event.getUser().isNotifyOwnEvents()
+ && event.getUser().getPrimaryEmailAddress() != null
+ && event.getUser().getPrimaryEmailAddress().isVerified()) {
+ notifyEmails.add(event.getUser().getPrimaryEmailAddress().getValue());
+ }
for (Map.Entry<User, Collection<String>> entry: subscribedQueryStrings.entrySet()) {
User user = entry.getKey();
Permission permission = new ProjectPermission(build.getProject(),
diff --git a/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java
index 3b6caa0c36..7ca1ce8b09 100644
--- a/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java
@@ -55,6 +55,7 @@ public class CodeCommentNotificationManager extends AbstractNotificationManager
Collection<User> notifyUsers = new HashSet<>();
+ notifyUsers.add(event.getUser());
notifyUsers.add(comment.getUser());
notifyUsers.addAll(comment.getReplies().stream().map(EntityComment::getUser).collect(toSet()));
notifyUsers.addAll(comment.getChanges().stream().map(CodeCommentStatusChange::getUser).collect(toSet()));
@@ -71,7 +72,7 @@ public class CodeCommentNotificationManager extends AbstractNotificationManager
Set<String> emailAddresses = notifyUsers.stream()
.filter(it -> it.isOrdinary()
- && !it.equals(event.getUser())
+ && (!it.equals(event.getUser()) || it.isNotifyOwnEvents())
&& it.getPrimaryEmailAddress() != null
&& it.getPrimaryEmailAddress().isVerified())
.map(it -> it.getPrimaryEmailAddress().getValue())
diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
index a8dd9b0a0a..48c4c889a8 100644
--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
@@ -167,7 +167,8 @@ public class IssueNotificationManager extends AbstractNotificationManager {
Collection<User> notifiedUsers = Sets.newHashSet();
if (user != null) {
- notifiedUsers.add(user); // no need to notify the user generating the event
+ if (!user.isNotifyOwnEvents())
+ notifiedUsers.add(user);
if (!user.isSystem())
watchManager.watch(issue, user, true);
}
@@ -270,6 +271,12 @@ public class IssueNotificationManager extends AbstractNotificationManager {
Collection<String> bccEmailAddresses = new HashSet<>();
+ if (user != null && user.isNotifyOwnEvents()
+ && user.getPrimaryEmailAddress() != null
+ && user.getPrimaryEmailAddress().isVerified()) {
+ bccEmailAddresses.add(user.getPrimaryEmailAddress().getValue());
+ }
+
for (IssueWatch watch: issue.getWatches()) {
Date visitDate = userInfoManager.getIssueVisitDate(watch.getUser(), issue);
if (watch.isWatching()
diff --git a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
index d154b19488..1eb649a0dc 100644
--- a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
@@ -126,7 +126,8 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
Collection<User> notifiedUsers = Sets.newHashSet();
if (user != null) {
- notifiedUsers.add(user); // no need to notify the user generating the event
+ if (!user.isNotifyOwnEvents())
+ notifiedUsers.add(user);
if (!user.isSystem())
watchManager.watch(request, user, true);
}
@@ -288,6 +289,11 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
if (!event.isMinor()) {
Collection<String> bccEmailAddresses = new HashSet<>();
+ if (user != null && user.isNotifyOwnEvents()
+ && user.getPrimaryEmailAddress() != null
+ && user.getPrimaryEmailAddress().isVerified()) {
+ bccEmailAddresses.add(user.getPrimaryEmailAddress().getValue());
+ }
for (PullRequestWatch watch : request.getWatches()) {
Date visitDate = userInfoManager.getPullRequestVisitDate(watch.getUser(), request);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/preferences/PreferencesEditPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/preferences/PreferencesEditPanel.html
new file mode 100644
index 0000000000..db1b09a00b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/preferences/PreferencesEditPanel.html
@@ -0,0 +1,9 @@
+<wicket:panel>
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="feedback" class="mb-4"></div>
+ <div wicket:id="editor"></div>
+ <div class="d-flex mt-5">
+ <input class="btn btn-primary dirty-aware" value="Save" type="submit">
+ </div>
+ </form>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/preferences/PreferencesEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/preferences/PreferencesEditPanel.java
new file mode 100644
index 0000000000..21a9a4487e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/preferences/PreferencesEditPanel.java
@@ -0,0 +1,71 @@
+package io.onedev.server.web.component.user.preferences;
+
+import com.google.common.collect.Sets;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.model.User;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.BeanEditor;
+import org.apache.wicket.Session;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.IModel;
+
+import java.io.Serializable;
+
+@SuppressWarnings("serial")
+public class PreferencesEditPanel extends GenericPanel<User> {
+
+ private BeanEditor editor;
+
+ public PreferencesEditPanel(String id, IModel<User> model) {
+ super(id, model);
+ }
+
+ private User getUser() {
+ return getModelObject();
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ editor = BeanContext.editModel("editor", new IModel<Serializable>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Serializable getObject() {
+ return getUser();
+ }
+
+ @Override
+ public void setObject(Serializable object) {
+ editor.getDescriptor().copyProperties(object, getUser());
+ }
+
+ }, Sets.newHashSet(User.PROP_NOTIFY_OWN_EVENTS), false);
+
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onSubmit() {
+ super.onSubmit();
+
+ User user = getUser();
+
+ UserManager userManager = OneDev.getInstance(UserManager.class);
+ userManager.update(user, null);
+ Session.get().success("Preferences updated");
+ setResponsePage(getPage().getClass(), getPage().getPageParameters());
+ }
+
+ };
+ form.add(editor);
+ form.add(new FencedFeedbackPanel("feedback", form).setEscapeModelStrings(false));
+ add(form);
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
index 4b1c064aa2..196d77cf05 100644
--- a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
+++ b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
@@ -53,6 +53,7 @@ import io.onedev.server.web.page.admin.usermanagement.emailaddresses.UserEmailAd
import io.onedev.server.web.page.admin.usermanagement.gpgkeys.UserGpgKeysPage;
import io.onedev.server.web.page.admin.usermanagement.membership.UserMembershipsPage;
import io.onedev.server.web.page.admin.usermanagement.password.UserPasswordPage;
+import io.onedev.server.web.page.admin.usermanagement.preferences.UserPreferencesPage;
import io.onedev.server.web.page.admin.usermanagement.profile.UserProfilePage;
import io.onedev.server.web.page.admin.usermanagement.sshkeys.UserSshKeysPage;
import io.onedev.server.web.page.builds.BuildListPage;
@@ -66,6 +67,7 @@ import io.onedev.server.web.page.my.avatar.MyAvatarPage;
import io.onedev.server.web.page.my.emailaddresses.MyEmailAddressesPage;
import io.onedev.server.web.page.my.gpgkeys.MyGpgKeysPage;
import io.onedev.server.web.page.my.password.MyPasswordPage;
+import io.onedev.server.web.page.my.preferences.MyPreferencesPage;
import io.onedev.server.web.page.my.profile.MyProfilePage;
import io.onedev.server.web.page.my.sshkeys.MySshKeysPage;
import io.onedev.server.web.page.my.twofactorauthentication.MyTwoFactorAuthenticationPage;
@@ -96,8 +98,8 @@ import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;
import io.onedev.server.web.page.project.issues.create.NewIssuePage;
import io.onedev.server.web.page.project.issues.detail.*;
import io.onedev.server.web.page.project.issues.imports.IssueImportPage;
-import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;
import io.onedev.server.web.page.project.issues.iteration.*;
+import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;
import io.onedev.server.web.page.project.packs.ProjectPacksPage;
import io.onedev.server.web.page.project.packs.detail.PackDetailPage;
import io.onedev.server.web.page.project.pullrequests.InvalidPullRequestPage;
@@ -172,6 +174,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {
add(new BasePageMapper("~my/gpg-keys", MyGpgKeysPage.class));
add(new BasePageMapper("~my/access-tokens", MyAccessTokensPage.class));
add(new BasePageMapper("~my/two-factor-authentication", MyTwoFactorAuthenticationPage.class));
+ add(new BasePageMapper("~my/preferences", MyPreferencesPage.class));
}
private void addResources() {
@@ -230,6 +233,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {
add(new BasePageMapper("~administration/users/${user}/ssh-keys", UserSshKeysPage.class));
add(new BasePageMapper("~administration/users/${user}/gpg-keys", UserGpgKeysPage.class));
add(new BasePageMapper("~administration/users/${user}/access-tokens", UserAccessTokensPage.class));
+ add(new BasePageMapper("~administration/users/${user}/preferences", UserPreferencesPage.class));
add(new BasePageMapper("~administration/invitations", InvitationListPage.class));
add(new BasePageMapper("~administration/invitations/new", NewInvitationPage.class));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java
index 3f6a0acaa0..a4364b340e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.page.admin.usermanagement;
+import com.google.common.collect.Sets;
import org.apache.shiro.authc.credential.PasswordService;
import org.apache.wicket.Component;
import org.apache.wicket.Session;
@@ -26,6 +27,8 @@ import io.onedev.server.web.page.admin.AdministrationPage;
import io.onedev.server.web.page.admin.usermanagement.profile.UserProfilePage;
import io.onedev.server.web.util.editbean.NewUserBean;
+import static io.onedev.server.model.User.PROP_NOTIFY_OWN_EVENTS;
+
@SuppressWarnings("serial")
public class NewUserPage extends AdministrationPage {
@@ -41,7 +44,7 @@ public class NewUserPage extends AdministrationPage {
protected void onInitialize() {
super.onInitialize();
- BeanEditor editor = BeanContext.edit("editor", newUserBean);
+ var editor = BeanContext.edit("editor", newUserBean, Sets.newHashSet(PROP_NOTIFY_OWN_EVENTS), true);
Form<?> form = new Form<Void>("form") {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserPage.java
index cf1f3c6656..82c6f12a1f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserPage.java
@@ -14,6 +14,7 @@ import io.onedev.server.web.page.admin.usermanagement.emailaddresses.UserEmailAd
import io.onedev.server.web.page.admin.usermanagement.gpgkeys.UserGpgKeysPage;
import io.onedev.server.web.page.admin.usermanagement.membership.UserMembershipsPage;
import io.onedev.server.web.page.admin.usermanagement.password.UserPasswordPage;
+import io.onedev.server.web.page.admin.usermanagement.preferences.UserPreferencesPage;
import io.onedev.server.web.page.admin.usermanagement.profile.UserProfilePage;
import io.onedev.server.web.page.admin.usermanagement.sshkeys.UserSshKeysPage;
import io.onedev.server.web.util.UserAware;
@@ -78,6 +79,7 @@ public abstract class UserPage extends AdministrationPage implements UserAware {
tabs.add(new PageTab(Model.of("SSH Keys"), Model.of("key"), UserSshKeysPage.class, params));
tabs.add(new PageTab(Model.of("GPG Keys"), Model.of("key"), UserGpgKeysPage.class, params));
tabs.add(new PageTab(Model.of("Access Tokens"), Model.of("token"), UserAccessTokensPage.class, params));
+ tabs.add(new PageTab(Model.of("Preferences"), Model.of("sliders"), UserPreferencesPage.class, params));
add(new Tabbable("userTabs", tabs));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/preferences/UserPreferencesPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/preferences/UserPreferencesPage.html
new file mode 100644
index 0000000000..d93f935cce
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/preferences/UserPreferencesPage.html
@@ -0,0 +1,3 @@
+<wicket:extend>
+ <div wicket:id="content"></div>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/preferences/UserPreferencesPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/preferences/UserPreferencesPage.java
new file mode 100644
index 0000000000..5a44a96f0f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/preferences/UserPreferencesPage.java
@@ -0,0 +1,21 @@
+package io.onedev.server.web.page.admin.usermanagement.preferences;
+
+import io.onedev.server.web.component.user.preferences.PreferencesEditPanel;
+import io.onedev.server.web.page.admin.usermanagement.UserPage;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+@SuppressWarnings("serial")
+public class UserPreferencesPage extends UserPage {
+
+ public UserPreferencesPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new PreferencesEditPanel("content", userModel));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
index f8ecf70777..5186fb9ab2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
@@ -98,6 +98,10 @@
<wicket:svg href="shield" class="icon mr-2"></wicket:svg>
Two-factor Authentication
</a>
+ <a wicket:id="myPreferences" class="dropdown-item">
+ <wicket:svg href="sliders" class="icon mr-2"></wicket:svg>
+ Preferences
+ </a>
<a wicket:id="signOut" class="dropdown-item">
<wicket:svg href="logout" class="icon mr-2"></wicket:svg>
<span wicket:id="label"></span>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index 6c538d6218..a487d3ba2a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -77,6 +77,7 @@ import io.onedev.server.web.page.my.avatar.MyAvatarPage;
import io.onedev.server.web.page.my.emailaddresses.MyEmailAddressesPage;
import io.onedev.server.web.page.my.gpgkeys.MyGpgKeysPage;
import io.onedev.server.web.page.my.password.MyPasswordPage;
+import io.onedev.server.web.page.my.preferences.MyPreferencesPage;
import io.onedev.server.web.page.my.profile.MyProfilePage;
import io.onedev.server.web.page.my.sshkeys.MySshKeysPage;
import io.onedev.server.web.page.my.twofactorauthentication.MyTwoFactorAuthenticationPage;
@@ -816,6 +817,10 @@ public abstract class LayoutPage extends BasePage {
if (getPage() instanceof MyTwoFactorAuthenticationPage)
item.add(AttributeAppender.append("class", "active"));
+ userInfo.add(item = new ViewStateAwarePageLink<Void>("myPreferences", MyPreferencesPage.class));
+ if (getPage() instanceof MyPreferencesPage)
+ item.add(AttributeAppender.append("class", "active"));
+
if (!SecurityUtils.isAnonymous(SecurityUtils.getPrevPrincipal())) {
Link<Void> signOutLink = new Link<Void>("signOut") {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/preferences/MyPreferencesPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/preferences/MyPreferencesPage.html
new file mode 100644
index 0000000000..0b1076727f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/preferences/MyPreferencesPage.html
@@ -0,0 +1,7 @@
+<wicket:extend>
+ <div class="card m-2 m-sm-5">
+ <div class="card-body">
+ <div wicket:id="content"></div>
+ </div>
+ </div>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/preferences/MyPreferencesPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/preferences/MyPreferencesPage.java
new file mode 100644
index 0000000000..30540e8dd4
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/preferences/MyPreferencesPage.java
@@ -0,0 +1,37 @@
+package io.onedev.server.web.page.my.preferences;
+
+import io.onedev.server.model.User;
+import io.onedev.server.web.component.user.preferences.PreferencesEditPanel;
+import io.onedev.server.web.page.my.MyPage;
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+@SuppressWarnings("serial")
+public class MyPreferencesPage extends MyPage {
+
+ public MyPreferencesPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new PreferencesEditPanel("content", new AbstractReadOnlyModel<>() {
+
+ @Override
+ public User getObject() {
+ return getLoginUser();
+ }
+
+ }));
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "My Preferences");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java
index d9cfb53f23..b7fe4c6d9a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java
@@ -27,6 +27,9 @@ import io.onedev.server.web.page.HomePage;
import io.onedev.server.web.page.simple.SimplePage;
import io.onedev.server.web.util.editbean.NewUserBean;
+import static io.onedev.server.model.User.PROP_GUEST;
+import static io.onedev.server.model.User.PROP_NOTIFY_OWN_EVENTS;
+
@SuppressWarnings("serial")
public class SignUpPage extends SimplePage {
@@ -48,7 +51,7 @@ public class SignUpPage extends SimplePage {
super.onInitialize();
NewUserBean newUserBean = new NewUserBean();
- BeanEditor editor = BeanContext.edit("editor", newUserBean, Sets.newHashSet(User.PROP_GUEST), true);
+ BeanEditor editor = BeanContext.edit("editor", newUserBean, Sets.newHashSet(PROP_GUEST, PROP_NOTIFY_OWN_EVENTS), true);
Form<?> form = new Form<Void>("form") {