The Unified and Autonomous Development Platform
Added a stub for mysshkeys page
Andrea Del Benefe784feade09
diff --git a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.javaindex 09f8e78642..6a05fd75a3 100644--- a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -4,7 +4,6 @@ import org.apache.wicket.core.request.mapper.ResourceMapper;import org.apache.wicket.markup.html.pages.BrowserInfoPage;import org.apache.wicket.protocol.http.WebApplication;import org.apache.wicket.request.mapper.CompoundRequestMapper;-import io.onedev.server.web.download.ArchiveDownloadResourceReference;import io.onedev.server.web.download.ArtifactDownloadResourceReference;import io.onedev.server.web.download.AttachmentDownloadResourceReference;@@ -43,6 +42,7 @@ import io.onedev.server.web.page.admin.user.create.NewUserPage;import io.onedev.server.web.page.admin.user.membership.UserMembershipsPage;import io.onedev.server.web.page.admin.user.password.UserPasswordPage;import io.onedev.server.web.page.admin.user.profile.UserProfilePage;+import io.onedev.server.web.page.admin.user.sshkeys.UserSshKeysPage;import io.onedev.server.web.page.admin.user.webhook.UserWebHooksPage;import io.onedev.server.web.page.build.BuildListPage;import io.onedev.server.web.page.init.ServerInitPage;@@ -154,6 +154,7 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("administration/users/${user}/authorizations", UserAuthorizationsPage.class));add(new OnePageMapper("administration/users/${user}/avatar", UserAvatarPage.class));add(new OnePageMapper("administration/users/${user}/password", UserPasswordPage.class));+ add(new OnePageMapper("administration/users/${user}/sshkeys", UserSshKeysPage.class));add(new OnePageMapper("administration/users/${user}/build-setting/secrets", UserSecretsPage.class));add(new OnePageMapper("administration/users/${user}/build-setting/build-preserve-rules", UserBuildPreservationsPage.class));add(new OnePageMapper("administration/users/${user}/web-hooks", UserWebHooksPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.javaindex bf2d7bf74b..da9ae88686 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java@@ -2,7 +2,6 @@ package io.onedev.server.web.page.admin.user;import java.util.ArrayList;import java.util.List;-import org.apache.wicket.Component;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.head.CssHeaderItem;@@ -12,7 +11,6 @@ import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.entitymanager.UserManager;@@ -33,6 +31,7 @@ import io.onedev.server.web.page.admin.user.buildsetting.UserSecretsPage;import io.onedev.server.web.page.admin.user.membership.UserMembershipsPage;import io.onedev.server.web.page.admin.user.password.UserPasswordPage;import io.onedev.server.web.page.admin.user.profile.UserProfilePage;+import io.onedev.server.web.page.admin.user.sshkeys.UserSshKeysPage;import io.onedev.server.web.page.admin.user.webhook.UserWebHooksPage;@SuppressWarnings("serial")@@ -90,6 +89,7 @@ public abstract class UserPage extends AdministrationPage {tabs.add(new UserTab("Edit Avatar", "fa fa-fw fa-picture-o", UserAvatarPage.class));tabs.add(new UserTab("Change Password", "fa fa-fw fa-key", UserPasswordPage.class));+ tabs.add(new UserTab("Sssh Keys", "fa fa-fw fa-lock", UserSshKeysPage.class));tabs.add(new UserTab("Belonging Groups", "fa fa-fw fa-group", UserMembershipsPage.class));tabs.add(new UserTab("Authorized Projects", "fa fa-fw fa-ext fa-repo", UserAuthorizationsPage.class));tabs.add(new UserTab("Build Setting", "fa fa-fw fa-cubes", UserSecretsPage.class, UserBuildSettingPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/sshkeys/UserSshKeysPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/sshkeys/UserSshKeysPage.htmlnew file mode 100644index 0000000000..9c2faa12fe--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/sshkeys/UserSshKeysPage.html@@ -0,0 +1,4 @@+<wicket:extend>+ <div class="page-title">Change Password</div>+ <div wicket:id="content"></div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/sshkeys/UserSshKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/sshkeys/UserSshKeysPage.javanew file mode 100644index 0000000000..cdfceae9cf--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/sshkeys/UserSshKeysPage.java@@ -0,0 +1,21 @@+package io.onedev.server.web.page.admin.user.sshkeys;++import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.server.web.page.admin.user.UserPage;++@SuppressWarnings("serial")+public class UserSshKeysPage extends UserPage {++ public UserSshKeysPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new Label("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.htmlindex 111ad4a4a8..58a4d41c78 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@@ -64,6 +64,7 @@<li wicket:id="myProfile"><a wicket:id="link"><i class="fa fa-fw fa-list-alt"></i> My Profile</a></li><li wicket:id="myAvatar"><a wicket:id="link"><i class="fa fa-fw fa-picture-o"></i> Edit Avatar</a></li><li wicket:id="myPassword"><a wicket:id="link"><i class="fa fa-fw fa-key"></i> Change Password</a></li>+ <li wicket:id="mySshKeys"><a wicket:id="link"><i class="fa fa-fw fa-lock"></i> Ssh Keys</a></li><li wicket:id="myBuildSetting"><a wicket:id="link"><i class="fa fa-fw fa-cubes"></i> Build Setting</a></li><li wicket:id="myWebHooks"><a wicket:id="link"><i class="fa fa-fw fa-volume-up"></i> Web Hooks</a></li><li role="separator" class="divider"></li>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.javaindex 74309b3560..5ebc0994bf 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@@ -13,7 +13,6 @@ import org.apache.wicket.markup.html.link.ExternalLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.repeater.RepeatingView;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.commons.launcher.loader.Plugin;import io.onedev.server.OneDev;@@ -50,6 +49,7 @@ import io.onedev.server.web.page.my.buildsetting.MyBuildSettingPage;import io.onedev.server.web.page.my.buildsetting.MySecretsPage;import io.onedev.server.web.page.my.password.MyPasswordPage;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.webhook.MyWebHooksPage;import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.page.security.LoginPage;@@ -203,6 +203,11 @@ public abstract class LayoutPage extends BasePage {if (getPage() instanceof MyPasswordPage)item.add(AttributeAppender.append("class", "active"));+ signedInContainer.add(item = new WebMarkupContainer("mySshKeys"));+ item.add(new ViewStateAwarePageLink<Void>("link", MySshKeysPage.class));+ if (getPage() instanceof MySshKeysPage)+ item.add(AttributeAppender.append("class", "active"));+signedInContainer.add(item = new WebMarkupContainer("myBuildSetting"));item.add(new ViewStateAwarePageLink<Void>("link", MySecretsPage.class));if (getPage() instanceof MyBuildSettingPage)diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.htmlnew file mode 100644index 0000000000..9c2faa12fe--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.html@@ -0,0 +1,4 @@+<wicket:extend>+ <div class="page-title">Change Password</div>+ <div wicket:id="content"></div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.javanew file mode 100644index 0000000000..a3afc50f6f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java@@ -0,0 +1,30 @@+package io.onedev.server.web.page.my.sshkeys;++import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.server.model.User;+import io.onedev.server.web.page.my.MyPage;++@SuppressWarnings("serial")+public class MySshKeysPage extends MyPage {++ public MySshKeysPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new Label("content", new AbstractReadOnlyModel<User>() {++ @Override+ public User getObject() {+ return getLoginUser();+ }++ }));+ }++}