Skip to content

The Unified and Autonomous Development Platform

Link to user details when click user name/avatar as admin

robin shena5c142cdd309
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.java
index 3ee4ce89ed..684791fd10 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/ident/UserIdentPanel.java
@@ -7,12 +7,19 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
+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.UserManager;
import io.onedev.server.model.User;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.behavior.dropdown.DropdownHoverBehavior;
import io.onedev.server.web.component.floating.AlignPlacement;
import io.onedev.server.web.component.user.avatar.UserAvatar;
import io.onedev.server.web.component.user.card.UserCardPanel;
+import io.onedev.server.web.page.admin.user.UserProfilePage;
+import io.onedev.server.web.page.my.MyProfilePage;
@SuppressWarnings("serial")
public class UserIdentPanel extends Panel {
@@ -38,6 +45,16 @@ public class UserIdentPanel extends Panel {
add(new Label("name", displayName).setVisible(mode != Mode.AVATAR));
add(AttributeAppender.append("class", "user"));
+ if (userId != null) {
+ User user = OneDev.getInstance(UserManager.class).load(userId);
+ if (SecurityUtils.isAdministrator()) {
+ CharSequence url = RequestCycle.get().urlFor(UserProfilePage.class, UserProfilePage.paramsOf(user));
+ add(AttributeAppender.append("href", url.toString()));
+ } else if (user.equals(SecurityUtils.getUser())) {
+ CharSequence url = RequestCycle.get().urlFor(MyProfilePage.class, new PageParameters());
+ add(AttributeAppender.append("href", url.toString()));
+ }
+ }
add(new DropdownHoverBehavior(AlignPlacement.top(8), 350) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/ident/ident.css b/server-core/src/main/java/io/onedev/server/web/component/user/ident/ident.css
index 22f49cf6e8..d8306d2f45 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/user/ident/ident.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/user/ident/ident.css
@@ -1,3 +1,3 @@
-a.user:hover, a.user:focus {
+a.user:not([href]):hover, a.user:not([href]):focus {
text-decoration: none;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html
index bb538c1b95..7c25ac42a2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html
@@ -2,6 +2,7 @@
<div class="project-info">
<div class="head clearfix">
<div wicket:id="name" class="name pull-left"></div>
+ <div class="owner pull-left">(owner: <a wicket:id="owner"></a>)</div>
<div class="pull-right">
<a wicket:id="forks" class="forks"><span wicket:id="label"></span></a>
<a wicket:id="forkNow" class="fork-now">fork now</a>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java
index 1999da00e5..bc14976c21 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java
@@ -25,6 +25,8 @@ import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.markdown.MarkdownViewer;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.user.ident.Mode;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.page.project.ProjectListPage;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;
@@ -44,6 +46,7 @@ public abstract class ProjectInfoPanel extends Panel {
super.onInitialize();
add(new Label("name", getProject().getName()));
+ add(new UserIdentPanel("owner", getProject().getOwner(), Mode.NAME));
add(new ModalLink("forkNow") {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/project-info.css b/server-core/src/main/java/io/onedev/server/web/page/project/info/project-info.css
index 2fdb772cc8..f0949d83b8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/project-info.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/project-info.css
@@ -12,8 +12,15 @@
font-size: 16px;
font-weight: bold;
}
+.project-info>.head>.name {
+ margin-right: 4px;
+}
+.project-info>.head>.owner {
+ margin-right: 20px;
+}
+
.project-info>.head .forks {
- margin: 0 8px 0 20px;
+ margin-right: 8px;
}
.project-info>.forked-from {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.html
index 354e71aae5..a0936bf660 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.html
@@ -14,7 +14,7 @@
</div>
</div>
<div class="panel panel-default">
- <div class="panel-heading"><b>Inherited from Owner</b></div>
+ <div class="panel-heading"><b>Inherited from <a wicket:id="owner">Owner</a></b></div>
<div class="panel-body">
<div wicket:id="inheritedBuildPreservations"></div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.java
index 83ea97e981..3e07577240 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.java
@@ -3,13 +3,19 @@ package io.onedev.server.web.page.project.setting.build;
import java.io.Serializable;
import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.editable.PropertyContext;
+import io.onedev.server.web.page.admin.user.buildsetting.UserBuildPreserveRulesPage;
+import io.onedev.server.web.page.my.buildsetting.MyBuildPreserveRulesPage;
@SuppressWarnings("serial")
public class ProjectBuildPreserveRulesPage extends ProjectBuildSettingPage {
@@ -22,8 +28,6 @@ public class ProjectBuildPreserveRulesPage extends ProjectBuildSettingPage {
protected void onInitialize() {
super.onInitialize();
- add(PropertyContext.view("inheritedBuildPreservations", getProject().getOwner().getBuildSetting(), "buildPreservations"));
-
Form<?> form = new Form<Void>("form") {
@Override
@@ -49,6 +53,27 @@ public class ProjectBuildPreserveRulesPage extends ProjectBuildSettingPage {
}, "buildPreservations"));
add(form);
+
+ add(PropertyContext.view("inheritedBuildPreservations",
+ getProject().getOwner().getBuildSetting(), "buildPreservations"));
+
+ if (SecurityUtils.isAdministrator()) {
+ add(new BookmarkablePageLink<Void>("owner", UserBuildPreserveRulesPage.class,
+ UserBuildPreserveRulesPage.paramsOf(getProject().getOwner())));
+ } else if (getProject().getOwner().equals(SecurityUtils.getUser())) {
+ add(new BookmarkablePageLink<Void>("owner", MyBuildPreserveRulesPage.class));
+ } else {
+ add(new WebMarkupContainer("owner") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("span");
+ }
+
+ });
+ }
+
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.html
index c142272e95..f57251840e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.html
@@ -13,7 +13,7 @@
</div>
</div>
<div class="panel panel-default">
- <div class="panel-heading"><b>Inherited from Owner</b></div>
+ <div class="panel-heading"><b>Inherited from <a wicket:id="owner">Owner</a></b></div>
<div class="panel-body">
<div wicket:id="inheritedSecrets"></div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.java
index 85f76cbbaa..ca619f0b4d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.java
@@ -6,17 +6,23 @@ import java.util.List;
import java.util.Set;
import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.support.JobSecret;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.inputspec.SecretInput;
import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.page.admin.user.buildsetting.UserSecretListPage;
+import io.onedev.server.web.page.my.buildsetting.MySecretListPage;
@SuppressWarnings("serial")
public class ProjectSecretListPage extends ProjectBuildSettingPage {
@@ -29,11 +35,10 @@ public class ProjectSecretListPage extends ProjectBuildSettingPage {
protected void onInitialize() {
super.onInitialize();
- List<JobSecret> inheritedSecrets = getProject().getBuildSetting().getInheritedSecrets(getProject());
- InheritedSecretsBean bean = new InheritedSecretsBean();
- bean.setSecrets(inheritedSecrets);
- add(PropertyContext.view("inheritedSecrets", bean, "secrets"));
-
+ String note = String.format("Define secrets to be used in build jobs. Secret value less "
+ + "than %d characters will not be masked in build log", SecretInput.MASK.length());
+ add(new Label("note", note).setEscapeModelStrings(false));
+
Form<?> form = new Form<Void>("form") {
@Override
@@ -70,9 +75,27 @@ public class ProjectSecretListPage extends ProjectBuildSettingPage {
add(form);
- String note = String.format("Define secrets to be used in build jobs. Secret value less "
- + "than %d characters will not be masked in build log", SecretInput.MASK.length());
- add(new Label("note", note).setEscapeModelStrings(false));
+ List<JobSecret> inheritedSecrets = getProject().getBuildSetting().getInheritedSecrets(getProject());
+ InheritedSecretsBean bean = new InheritedSecretsBean();
+ bean.setSecrets(inheritedSecrets);
+ add(PropertyContext.view("inheritedSecrets", bean, "secrets"));
+
+ if (SecurityUtils.isAdministrator()) {
+ add(new BookmarkablePageLink<Void>("owner", UserSecretListPage.class,
+ UserSecretListPage.paramsOf(getProject().getOwner())));
+ } else if (getProject().getOwner().equals(SecurityUtils.getUser())) {
+ add(new BookmarkablePageLink<Void>("owner", MySecretListPage.class));
+ } else {
+ add(new WebMarkupContainer("owner") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("span");
+ }
+
+ });
+ }
}
@Editable