The Unified and Autonomous Development Platform
Navigate to same page if possible in project navigator
Robin Shenfdbf29e14d54
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ChildLinkPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ChildLinkPanel.javaindex 87a86d91fa..1708932615 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ChildLinkPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ChildLinkPanel.java@@ -1,16 +1,14 @@package io.onedev.server.web.component.project.childrentree;+import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.project.avatar.ProjectAvatar;-import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;@SuppressWarnings("serial")-class ChildLinkPanel extends Panel {+abstract class ChildLinkPanel extends Panel {private final ProjectFacade child;@@ -22,11 +20,12 @@ class ChildLinkPanel extends Panel {@Overrideprotected void onInitialize() {super.onInitialize();- Link<?> link = new ViewStateAwarePageLink<Void>("link", ProjectDashboardPage.class,- ProjectDashboardPage.paramsOf(child.getId()));+ WebMarkupContainer link = newChildLink("link", child.getId());link.add(new ProjectAvatar("avatar", child.getId()));link.add(new Label("name", child.getName()));add(link);}++ protected abstract WebMarkupContainer newChildLink(String componentId, Long childId);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ProjectChildrenTree.java b/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ProjectChildrenTree.javaindex 39967db6c8..c58706fc5f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ProjectChildrenTree.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/childrentree/ProjectChildrenTree.java@@ -11,12 +11,15 @@ import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;import org.apache.wicket.extensions.markup.html.repeater.tree.theme.HumanTheme;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.util.facade.ProjectFacade;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;@SuppressWarnings("serial")public class ProjectChildrenTree extends NestedTree<ProjectFacade> {@@ -83,7 +86,14 @@ public class ProjectChildrenTree extends NestedTree<ProjectFacade> {@Overrideprotected Component newContentComponent(String id, IModel<ProjectFacade> model) {ProjectFacade child = model.getObject();- return new ChildLinkPanel(id, child);+ return new ChildLinkPanel(id, child) {++ @Override+ protected WebMarkupContainer newChildLink(String componentId, Long childId) {+ return ProjectChildrenTree.this.newChildLink(componentId, childId);+ }++ };}protected Set<Long> getExpandedProjectIds() {@@ -100,4 +110,9 @@ public class ProjectChildrenTree extends NestedTree<ProjectFacade> {response.render(CssHeaderItem.forReference(new ProjectChildrenTreeCssResourceReference()));}+ protected WebMarkupContainer newChildLink(String componentId, Long childId) {+ return new ViewStateAwarePageLink<Void>(componentId, ProjectDashboardPage.class,+ ProjectDashboardPage.paramsOf(childId));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 88a5b1f803..e6555bb3f2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -20,7 +20,6 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;@@ -44,7 +43,7 @@ import io.onedev.server.web.asset.dropdowntriangleindicator.DropdownTriangleIndiimport io.onedev.server.web.avatar.AvatarManager;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;import io.onedev.server.web.component.project.childrentree.ProjectChildrenTree;import io.onedev.server.web.component.project.info.ProjectInfoPanel;import io.onedev.server.web.editable.EditableUtils;@@ -61,7 +60,6 @@ import io.onedev.server.web.page.project.codecomments.ProjectCodeCommentsPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.commits.ProjectCommitsPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;-import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;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.IssueDetailPage;@@ -335,13 +333,25 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {}}) {++ protected WebMarkupContainer newProjectLink(String componentId, Long projectId) {++ return new ViewStateAwareAjaxLink<Void>(componentId) {++ @Override+ public void onClick(AjaxRequestTarget target) {+ navToProject(getProjectManager().load(projectId));+ }++ };++ }@Overrideprotected void populateItem(ListItem<Project> item) {Project project = item.getModelObject();if (SecurityUtils.canAccess(project)) {- Link<Void> link = new ViewStateAwarePageLink<Void>("link",- ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project));+ WebMarkupContainer link = newProjectLink("link", project.getId());link.add(new Label("label", project.getName()));item.add(link);@@ -352,7 +362,14 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {- return new ProjectChildrenTree(id, projectId);+ return new ProjectChildrenTree(id, projectId) {++ @Override+ protected WebMarkupContainer newChildLink(String componentId, Long childId) {+ return newProjectLink(componentId, childId);+ }++ };}});@@ -383,7 +400,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {fragment.add(newProjectTitle("projectTitle"));return fragment;}-+@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);@@ -395,6 +412,8 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {return getProject().getPath();}+ protected abstract void navToProject(Project project);+private ProjectManager getProjectManager() {return OneDev.getInstance(ProjectManager.class);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex 16b6609046..4e8acbf6ef 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -86,9 +86,9 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.TransactionManager;-import io.onedev.server.search.code.CommitIndexed;import io.onedev.server.search.code.CodeIndexManager;import io.onedev.server.search.code.CodeSearchManager;+import io.onedev.server.search.code.CommitIndexed;import io.onedev.server.search.code.hit.QueryHit;import io.onedev.server.search.code.query.BlobQuery;import io.onedev.server.search.code.query.TextQuery;@@ -128,6 +128,7 @@ import io.onedev.server.web.page.project.blob.search.advanced.AdvancedSearchPaneimport io.onedev.server.web.page.project.blob.search.quick.QuickSearchPanel;import io.onedev.server.web.page.project.blob.search.result.SearchResultPanel;import io.onedev.server.web.page.project.commits.ProjectCommitsPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.resource.RawBlobResource;import io.onedev.server.web.resource.RawBlobResourceReference;import io.onedev.server.web.util.EditParamsAware;@@ -1667,4 +1668,12 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,return new JobSecretAuthorizationContext(getProject(), getCommit(), getPullRequest());}+ @Override+ protected void navToProject(Project project) {+ if (project.isCodeManagement() && SecurityUtils.canReadCode(project))+ setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.javaindex 8c827b8f74..6a5053bad9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java@@ -91,6 +91,7 @@ import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;import io.onedev.server.web.util.LoadableDetachableDataProvider;@@ -901,4 +902,12 @@ public class ProjectBranchesPage extends ProjectPage {return "Branches - " + getProject().getPath();}+ @Override+ protected void navToProject(Project project) {+ if (project.isCodeManagement() && SecurityUtils.canReadCode(project))+ setResponsePage(ProjectBranchesPage.class, ProjectBranchesPage.paramsOf(project));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.javaindex 24fa7ced2d..c7aa9c9544 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java@@ -32,6 +32,7 @@ import io.onedev.server.web.component.savedquery.PersonalQuerySupport;import io.onedev.server.web.component.savedquery.SaveQueryPanel;import io.onedev.server.web.component.savedquery.SavedQueriesPanel;import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.util.NamedBuildQueriesBean;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QuerySaveSupport;@@ -246,6 +247,14 @@ public class ProjectBuildsPage extends ProjectPage {return paramsOf(project, query, page);}+ @Override+ protected void navToProject(Project project) {+ if (project.isCodeManagement())+ setResponsePage(ProjectBuildsPage.class, ProjectBuildsPage.paramsOf(project, 0));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+@Overrideprotected Component newProjectTitle(String componentId) {return new Label(componentId, "Builds");diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.htmlindex d7a048c8fe..a1c9a68826 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html@@ -29,8 +29,10 @@</div></div><wicket:fragment wicket:id="projectTitleFrag">- <a wicket:id="builds" class="text-nowrap">Builds</a>- <span class="dot"></span>- <span wicket:id="buildNumber"></span>+ <span class="d-flex align-items-center">+ <a wicket:id="builds" class="text-nowrap">Builds</a>+ <span class="dot"></span>+ <span wicket:id="buildNumber"></span>+ </span></wicket:fragment></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex 94525682c6..d0aa656423 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -85,6 +85,7 @@ import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPimport io.onedev.server.web.page.project.builds.detail.issues.FixedIssuesPage;import io.onedev.server.web.page.project.builds.detail.log.BuildLogPage;import io.onedev.server.web.page.project.builds.detail.pipeline.BuildPipelinePage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.util.BuildAware;import io.onedev.server.web.util.ConfirmClickModifier;import io.onedev.server.web.util.Cursor;@@ -155,6 +156,14 @@ public abstract class BuildDetailPage extends ProjectPagereturn SecurityUtils.canAccess(getBuild());}+ @Override+ protected void navToProject(Project project) {+ if (project.isCodeManagement())+ setResponsePage(ProjectBuildsPage.class, ProjectBuildsPage.paramsOf(project, 0));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+private WebSocketObserver newBuildObserver(Long buildId) {return new WebSocketObserver() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.htmlindex 42bc66335d..835935a6d3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.html@@ -22,8 +22,10 @@</div></div><wicket:fragment wicket:id="projectTitleFrag">- <a wicket:id="builds" class="text-nowrap">Builds</a>- <span class="dot"></span>- <span wicket:id="buildNumber"></span>+ <span class="d-flex align-items-center">+ <a wicket:id="builds" class="text-nowrap">Builds</a>+ <span class="dot"></span>+ <span wicket:id="buildNumber"></span>+ </span></wicket:fragment></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.javaindex c9616c456b..6eec088870 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/InvalidBuildPage.java@@ -18,10 +18,12 @@ import com.google.common.base.Preconditions;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;+import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebSession;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.builds.ProjectBuildsPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.util.ConfirmClickModifier;@SuppressWarnings("serial")@@ -97,6 +99,14 @@ public class InvalidBuildPage extends ProjectPage {return SecurityUtils.canAccess(getBuild());}+ @Override+ protected void navToProject(Project project) {+ if (project.isCodeManagement())+ setResponsePage(ProjectBuildsPage.class, ProjectBuildsPage.paramsOf(project, 0));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+@Overrideprotected Component newProjectTitle(String componentId) {Fragment fragment = new Fragment(componentId, "projectTitleFrag", this);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/children/ProjectChildrenPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/children/ProjectChildrenPage.javaindex 35f80edc5c..1fb87ea3c8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/children/ProjectChildrenPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/children/ProjectChildrenPage.java@@ -112,4 +112,9 @@ public class ProjectChildrenPage extends ProjectPage {return "Child Projects - " + getProject().getPath();}+ @Override+ protected void navToProject(Project project) {+ setResponsePage(ProjectChildrenPage.class, ProjectChildrenPage.paramsOf(project));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/InvalidCodeCommentPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/InvalidCodeCommentPage.htmlindex 024177f2bf..fbe4d661c9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/InvalidCodeCommentPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/InvalidCodeCommentPage.html@@ -22,8 +22,10 @@</div></div><wicket:fragment wicket:id="projectTitleFrag">- <a wicket:id="codeComments" class="text-nowrap">Code Comments</a>- <span class="dot"></span>- <span wicket:id="codeCommentNumber"></span>+ <span class="d-flex align-items-center">+ <a wicket:id="codeComments" class="text-nowrap">Code Comments</a>+ <span class="dot"></span>+ <span wicket:id="codeCommentNumber"></span>+ </span></wicket:fragment></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/InvalidCodeCommentPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/InvalidCodeCommentPage.javaindex 89a028bfe2..bec9ad7b71 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/InvalidCodeCommentPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/InvalidCodeCommentPage.java@@ -18,9 +18,11 @@ import com.google.common.base.Preconditions;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.model.CodeComment;+import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebSession;import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.util.ConfirmClickModifier;@SuppressWarnings("serial")@@ -110,4 +112,12 @@ public class InvalidCodeCommentPage extends ProjectPage {return fragment;}+ @Override+ protected void navToProject(Project project) {+ if (project.isCodeManagement() && SecurityUtils.canReadCode(project))+ setResponsePage(ProjectCodeCommentsPage.class, ProjectCodeCommentsPage.paramsOf(project, 0));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.javaindex c2d6a540bc..38ad5a3df0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java@@ -30,6 +30,7 @@ import io.onedev.server.web.component.savedquery.NamedQueriesBean;import io.onedev.server.web.component.savedquery.SaveQueryPanel;import io.onedev.server.web.component.savedquery.SavedQueriesPanel;import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QuerySaveSupport;@@ -243,4 +244,12 @@ public class ProjectCodeCommentsPage extends ProjectPage {return "Code Comments - " + getProject().getPath();}+ @Override+ protected void navToProject(Project project) {+ if (project.isCodeManagement() && SecurityUtils.canReadCode(project))+ setResponsePage(ProjectCodeCommentsPage.class, ProjectCodeCommentsPage.paramsOf(project, 0));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.htmlindex 4fb99d0358..d9bf98d81c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html@@ -60,8 +60,10 @@</div></wicket:fragment><wicket:fragment wicket:id="projectTitleFrag">- <a wicket:id="commits">Commits</a>- <span class="dot"></span>- <span wicket:id="commitHash"></span>+ <span class="d-flex align-items-center">+ <a wicket:id="commits">Commits</a>+ <span class="dot"></span>+ <span wicket:id="commitHash"></span>+ </span></wicket:fragment></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex 7d8713682c..c177b8e345 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -83,6 +83,7 @@ import io.onedev.server.web.component.svg.SpriteImage;import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.util.ReferenceTransformer;import io.onedev.server.web.util.RevisionDiff;@@ -797,6 +798,14 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota+ " - " + getProject().getPath();}+ @Override+ protected void navToProject(Project project) {+ if (project.isCodeManagement() && SecurityUtils.canReadCode(project))+ setResponsePage(ProjectCommitsPage.class, ProjectCommitsPage.paramsOf(project.getId()));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+@Nullableprivate PullRequest getPullRequest() {if (state.requestId != null)diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.javaindex dd0617fc7f..d0bee9fc60 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java@@ -25,11 +25,12 @@ import io.onedev.server.model.support.QueryPersonalization;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.commit.list.CommitListPanel;import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.component.savedquery.PersonalQuerySupport;import io.onedev.server.web.component.savedquery.NamedQueriesBean;+import io.onedev.server.web.component.savedquery.PersonalQuerySupport;import io.onedev.server.web.component.savedquery.SaveQueryPanel;import io.onedev.server.web.component.savedquery.SavedQueriesPanel;import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.util.QuerySaveSupport;@SuppressWarnings("serial")@@ -237,4 +238,12 @@ public class ProjectCommitsPage extends ProjectPage {return "Commits - " + getProject().getPath();}+ @Override+ protected void navToProject(Project project) {+ if (project.isCodeManagement() && SecurityUtils.canReadCode(project))+ setResponsePage(ProjectCommitsPage.class, ProjectCommitsPage.paramsOf(project));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex bf4be73083..fabf9914fb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -65,6 +65,7 @@ import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;@@ -933,4 +934,12 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Annreturn "Code Compare - " + getProject().getPath();}+ @Override+ protected void navToProject(Project project) {+ if (project.isCodeManagement() && SecurityUtils.canReadCode(project))+ setResponsePage(RevisionComparePage.class, RevisionComparePage.paramsOf(project));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.javaindex 0ca6888c52..0da3125491 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.java@@ -7,6 +7,7 @@ import org.apache.wicket.core.request.handler.RenderPageRequestHandler.RedirectPimport org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;@@ -34,4 +35,9 @@ public class ProjectDashboardPage extends ProjectPage {return new Label(componentId, "Dashboard");}+ @Override+ protected void navToProject(Project project) {+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.javaindex ab374cce0e..9c00c681f2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java@@ -71,6 +71,7 @@ import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.orderedit.OrderEditPanel;import io.onedev.server.web.component.svg.SpriteImage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.page.project.issues.ProjectIssuesPage;import io.onedev.server.web.util.ConfirmClickModifier;@@ -1098,4 +1099,12 @@ public class IssueBoardsPage extends ProjectIssuesPage {return "Issue Boards - " + getProject().getPath();}+ @Override+ protected void navToProject(Project project) {+ if (project.isIssueManagement())+ setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(project));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.javaindex b5bc3fb343..6bf8741834 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java@@ -30,7 +30,9 @@ import io.onedev.server.util.script.identity.SiteAdministrator;import io.onedev.server.web.component.issue.create.NewIssueEditor;import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChangeAlertPanel;import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;+import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;import io.onedev.server.web.page.simple.security.LoginPage;@SuppressWarnings("serial")@@ -145,4 +147,12 @@ public class NewIssuePage extends ProjectPage implements InputContext, ScriptIdereturn new Label(componentId, "<span class='text-nowrap'>Create Issue</span>").setEscapeModelStrings(false);}+ @Override+ protected void navToProject(Project project) {+ if (project.isIssueManagement())+ setResponsePage(ProjectIssueListPage.class, ProjectIssueListPage.paramsOf(project, false, 0));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.htmlindex d9a28b0a39..c0a1202633 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html@@ -14,8 +14,10 @@</div></div><wicket:fragment wicket:id="projectTitleFrag">- <a wicket:id="issues">Issues</a>- <span class="dot"></span>- <span wicket:id="issueNumber"></span>+ <span class="d-flex align-items-center">+ <a wicket:id="issues">Issues</a>+ <span class="dot"></span>+ <span wicket:id="issueNumber"></span>+ </span></wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex 9707bfe8e9..bc621ebfcb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -55,6 +55,7 @@ import io.onedev.server.web.component.tabbable.PageTabHead;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.page.project.issues.ProjectIssuesPage;import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;import io.onedev.server.web.util.ConfirmClickModifier;@@ -344,4 +345,12 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Inputresponse.render(CssHeaderItem.forReference(new IssueDetailCssResourceReference()));}+ @Override+ protected void navToProject(Project project) {+ if (project.isIssueManagement())+ setResponsePage(ProjectIssueListPage.class, ProjectIssueListPage.paramsOf(project, false, 0));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.javaindex c21be13147..ad193e63cb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.java@@ -24,6 +24,7 @@ import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.imports.ImportPanel;import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;@SuppressWarnings("serial")@@ -101,4 +102,12 @@ public class IssueImportPage<Where extends Serializable, What extends Serializabreturn params;}+ @Override+ protected void navToProject(Project project) {+ if (project.isIssueManagement())+ setResponsePage(ProjectIssueListPage.class, ProjectIssueListPage.paramsOf(project, false, 0));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.javaindex 9bcbc7dce8..8a00750ab3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java@@ -30,6 +30,7 @@ import io.onedev.server.web.component.savedquery.NamedQueriesBean;import io.onedev.server.web.component.savedquery.PersonalQuerySupport;import io.onedev.server.web.component.savedquery.SaveQueryPanel;import io.onedev.server.web.component.savedquery.SavedQueriesPanel;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.page.project.issues.ProjectIssuesPage;import io.onedev.server.web.util.NamedIssueQueriesBean;import io.onedev.server.web.util.PagingHistorySupport;@@ -277,4 +278,12 @@ public class ProjectIssueListPage extends ProjectIssuesPage {return new Label(componentId, "Issues");}+ @Override+ protected void navToProject(Project project) {+ if (project.isIssueManagement())+ setResponsePage(ProjectIssueListPage.class, ProjectIssueListPage.paramsOf(project, false, 0));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.htmlindex 84aa4f8780..0c1eef050e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.html@@ -17,8 +17,10 @@</div></div><wicket:fragment wicket:id="projectTitleFrag">- <a wicket:id="milestones">Milestones</a>- <span class="dot"></span>- <span wicket:id="milestoneName" class="text-truncated"></span>+ <span class="d-flex align-items-center">+ <a wicket:id="milestones">Milestones</a>+ <span class="dot"></span>+ <span wicket:id="milestoneName" class="text-truncated"></span>+ </span></wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.javaindex 3321af783b..306c195aa7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java@@ -39,6 +39,7 @@ import io.onedev.server.web.component.tabbable.PageTabHead;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;@SuppressWarnings("serial")public abstract class MilestoneDetailPage extends ProjectPage implements ScriptIdentityAware {@@ -185,4 +186,12 @@ public abstract class MilestoneDetailPage extends ProjectPage implements ScriptI}+ @Override+ protected void navToProject(Project project) {+ if (project.isIssueManagement())+ setResponsePage(MilestoneListPage.class, MilestoneListPage.paramsOf(project, false, null));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.htmlindex afb803e81f..3ebce862ca 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.html@@ -10,10 +10,12 @@</div></div><wicket:fragment wicket:id="projectTitleFrag">- <a wicket:id="milestones">Milestones</a>- <span class="dot"></span>- <a wicket:id="milestone"><span wicket:id="name" class="text-truncated"></span></a>- <span class="dot"></span>- Edit+ <span class="d-flex align-items-center">+ <a wicket:id="milestones">Milestones</a>+ <span class="dot"></span>+ <a wicket:id="milestone"><span wicket:id="name" class="text-truncated"></span></a>+ <span class="dot"></span>+ Edit+ </span></wicket:fragment></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.javaindex bcb9a48bb0..f9419c309d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java@@ -14,12 +14,14 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.model.Milestone;+import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;@SuppressWarnings("serial")public class MilestoneEditPage extends ProjectPage {@@ -108,4 +110,12 @@ public class MilestoneEditPage extends ProjectPage {return fragment;}+ @Override+ protected void navToProject(Project project) {+ if (project.isIssueManagement())+ setResponsePage(MilestoneListPage.class, MilestoneListPage.paramsOf(project, false, null));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.javaindex e1b9096d7c..105f743b80 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java@@ -54,6 +54,7 @@ import io.onedev.server.web.component.menu.MenuItem;import io.onedev.server.web.component.menu.MenuLink;import io.onedev.server.web.component.milestone.MilestoneDateLabel;import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.util.LoadableDetachableDataProvider;import io.onedev.server.web.util.PagingHistorySupport;@@ -397,4 +398,12 @@ public class MilestoneListPage extends ProjectPage {return "Milestones - " + getProject().getPath();}+ @Override+ protected void navToProject(Project project) {+ if (project.isIssueManagement())+ setResponsePage(MilestoneListPage.class, MilestoneListPage.paramsOf(project, false, null));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.javaindex 5d0e5dd02b..927c4e0dc9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java@@ -16,6 +16,7 @@ import io.onedev.server.util.PathNode;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;@SuppressWarnings("serial")public class NewMilestonePage extends ProjectPage {@@ -71,4 +72,12 @@ public class NewMilestonePage extends ProjectPage {return new Label(componentId, "Create Milestone");}+ @Override+ protected void navToProject(Project project) {+ if (project.isIssueManagement())+ setResponsePage(MilestoneListPage.class, MilestoneListPage.paramsOf(project, false, null));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.htmlindex 8bfe4ec356..fff14ce024 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.html@@ -22,8 +22,10 @@</div></div><wicket:fragment wicket:id="projectTitleFrag">- <a wicket:id="pullRequests" class="text-nowrap">Pull Requests</a>- <span class="dot"></span>- <span wicket:id="pullRequestNumber"></span>+ <span class="d-flex align-items-center">+ <a wicket:id="pullRequests" class="text-nowrap">Pull Requests</a>+ <span class="dot"></span>+ <span wicket:id="pullRequestNumber"></span>+ </span></wicket:fragment></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.javaindex 57750ec302..44691a8e68 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidPullRequestPage.java@@ -17,10 +17,12 @@ import com.google.common.base.Preconditions;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebSession;import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.util.ConfirmClickModifier;@SuppressWarnings("serial")@@ -105,4 +107,12 @@ public class InvalidPullRequestPage extends ProjectPage {return fragment;}+ @Override+ protected void navToProject(Project project) {+ if (project.isCodeManagement() && SecurityUtils.canReadCode(project))+ setResponsePage(ProjectPullRequestsPage.class, ProjectPullRequestsPage.paramsOf(project, 0));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.javaindex e82ee48eb7..c4981bdb37 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java@@ -33,6 +33,7 @@ import io.onedev.server.web.component.savedquery.PersonalQuerySupport;import io.onedev.server.web.component.savedquery.SaveQueryPanel;import io.onedev.server.web.component.savedquery.SavedQueriesPanel;import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.util.NamedPullRequestQueriesBean;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QuerySaveSupport;@@ -264,4 +265,12 @@ public class ProjectPullRequestsPage extends ProjectPage {return "Pull Requests - " + getProject().getPath();}+ @Override+ protected void navToProject(Project project) {+ if (project.isCodeManagement() && SecurityUtils.canReadCode(project))+ setResponsePage(ProjectPullRequestsPage.class, ProjectPullRequestsPage.paramsOf(project, 0));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex 85577d3673..9b19663eb8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -97,6 +97,8 @@ import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;+import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;import io.onedev.server.web.page.simple.security.LoginPage;@@ -1015,4 +1017,12 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Annoreturn new Label(componentId, "<span class='text-nowrap'>Create Pull Request</span>").setEscapeModelStrings(false);}+ @Override+ protected void navToProject(Project project) {+ if (project.isCodeManagement() && SecurityUtils.canReadCode(project))+ setResponsePage(ProjectPullRequestsPage.class, ProjectPullRequestsPage.paramsOf(project, 0));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.htmlindex 7f694f3ee7..af0f38d3be 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html@@ -172,9 +172,11 @@</div></wicket:fragment><wicket:fragment wicket:id="projectTitleFrag">- <a wicket:id="pullRequests" class="text-nowrap">Pull Requests</a>- <span class="dot"></span>- <span wicket:id="pullRequestNumber"></span>+ <span class="d-flex align-items-center">+ <a wicket:id="pullRequests" class="text-nowrap">Pull Requests</a>+ <span class="dot"></span>+ <span wicket:id="pullRequestNumber"></span>+ </span></wicket:fragment><wicket:fragment wicket:id="cloneFrag"><div class="p-4">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex bc355bda97..8c117844a8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -105,6 +105,7 @@ import io.onedev.server.web.component.tabbable.Tabbable;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.ProjectPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.page.project.pullrequests.InvalidPullRequestPage;import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;@@ -1592,5 +1593,13 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRprotected String getPageTitle() {return getPullRequest().getTitle() + " - Pull Request #" + getPullRequest().getNumber() + " - " + getProject().getPath();}++ @Override+ protected void navToProject(Project project) {+ if (project.isCodeManagement() && SecurityUtils.canReadCode(project))+ setResponsePage(ProjectPullRequestsPage.class, ProjectPullRequestsPage.paramsOf(project, 0));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.javaindex 262dee7422..f88def6705 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java@@ -4,8 +4,10 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;@SuppressWarnings("serial")public abstract class ProjectSettingPage extends ProjectPage {@@ -19,6 +21,14 @@ public abstract class ProjectSettingPage extends ProjectPage {return SecurityUtils.canManage(getProject());}+ @Override+ protected void navToProject(Project project) {+ if (SecurityUtils.canManage(project))+ setResponsePage(getPageClass(), paramsOf(project.getId()));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectPage.paramsOf(project.getId()));+ }+@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.javaindex a3ac873777..dfabd6e878 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/pluginsettings/ContributedProjectSettingPage.java@@ -18,9 +18,12 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.EditableUtils;+import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.page.project.setting.ContributedProjectSetting;import io.onedev.server.web.page.project.setting.ProjectSettingContribution;import io.onedev.server.web.page.project.setting.ProjectSettingPage;@@ -162,4 +165,12 @@ public class ContributedProjectSettingPage extends ProjectSettingPage {return new Label(componentId, EditableUtils.getDisplayName(settingClass));}+ @Override+ protected void navToProject(Project project) {+ if (SecurityUtils.canManage(project))+ setResponsePage(ContributedProjectSettingPage.class, paramsOf(project, settingClass));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectPage.paramsOf(project.getId()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/servicedesk/ProjectServiceDeskSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/servicedesk/ProjectServiceDeskSettingPage.javaindex 3bf95d86fe..a13766fb3c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/servicedesk/ProjectServiceDeskSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/servicedesk/ProjectServiceDeskSettingPage.java@@ -9,11 +9,15 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;+import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.page.project.setting.ProjectSettingPage;+import io.onedev.server.web.page.project.setting.general.GeneralProjectSettingPage;@SuppressWarnings("serial")public class ProjectServiceDeskSettingPage extends ProjectSettingPage {@@ -63,4 +67,16 @@ public class ProjectServiceDeskSettingPage extends ProjectSettingPage {return new Label(componentId, "<span class='text-truncate'>Service Desk Setting</span>").setEscapeModelStrings(false);}+ @Override+ protected void navToProject(Project project) {+ if (SecurityUtils.canManage(project)) {+ if (project.isIssueManagement())+ setResponsePage(ProjectServiceDeskSettingPage.class, paramsOf(project.getId()));+ else+ setResponsePage(GeneralProjectSettingPage.class, paramsOf(project.getId()));+ } else {+ setResponsePage(ProjectDashboardPage.class, ProjectPage.paramsOf(project.getId()));+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.javaindex 1f95668214..893a3ccab8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java@@ -4,8 +4,10 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;@SuppressWarnings("serial")public abstract class ProjectStatsPage extends ProjectPage {@@ -35,4 +37,12 @@ public abstract class ProjectStatsPage extends ProjectPage {return "Statistics - " + getProject().getPath();}+ @Override+ protected void navToProject(Project project) {+ if (project.isCodeManagement() && SecurityUtils.canReadCode(project))+ setResponsePage(getPageClass(), ProjectStatsPage.paramsOf(project.getId()));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.javaindex 64f63494ad..f6f676192d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/buildmetric/BuildMetricStatsPage.java@@ -36,6 +36,7 @@ import io.onedev.server.entitymanager.BuildMetricManager;import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.Project;import io.onedev.server.search.buildmetric.BuildMetricQuery;+import io.onedev.server.search.buildmetric.BuildMetricQueryParser;import io.onedev.server.util.BeanUtils;import io.onedev.server.util.Day;import io.onedev.server.util.MetricIndicator;@@ -47,6 +48,7 @@ import io.onedev.server.web.component.chart.line.Line;import io.onedev.server.web.component.chart.line.LineChartPanel;import io.onedev.server.web.component.chart.line.LineSeries;import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;@SuppressWarnings("serial")public abstract class BuildMetricStatsPage<T extends AbstractEntity> extends ProjectPage {@@ -283,4 +285,17 @@ public abstract class BuildMetricStatsPage<T extends AbstractEntity> extends Proreturn params;}+ public static PageParameters paramsOf(Project project) {+ String query = String.format("%s \"last month\"", BuildMetricQuery.getRuleName(BuildMetricQueryParser.Since));+ return paramsOf(project, query);+ }++ @Override+ protected void navToProject(Project project) {+ if (!OneDev.getInstance(BuildMetricManager.class).getAccessibleReportNames(project, metricClass).isEmpty())+ setResponsePage(getPageClass(), paramsOf(project));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.javaindex af8c5bfd48..23fef5fb1a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java@@ -79,6 +79,7 @@ import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.util.LoadableDetachableDataProvider;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.ReferenceTransformer;@@ -509,4 +510,12 @@ public class ProjectTagsPage extends ProjectPage {return "Tags - " + getProject().getPath();}+ @Override+ protected void navToProject(Project project) {+ if (project.isCodeManagement() && SecurityUtils.canReadCode(project))+ setResponsePage(ProjectTagsPage.class, ProjectTagsPage.paramsOf(project));+ else+ setResponsePage(ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project.getId()));+ }+}diff --git a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReportModule.java b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReportModule.javaindex 37ef6c9675..0f8b53a891 100644--- a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReportModule.java+++ b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageReportModule.java@@ -23,8 +23,6 @@ import io.onedev.server.entitymanager.BuildMetricManager;import io.onedev.server.model.Build;import io.onedev.server.model.CoverageMetric;import io.onedev.server.model.Project;-import io.onedev.server.search.buildmetric.BuildMetricQuery;-import io.onedev.server.search.buildmetric.BuildMetricQueryParser;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebApplicationConfigurator;import io.onedev.server.web.mapper.DynamicPathPageMapper;@@ -50,9 +48,7 @@ public class CoverageReportModule extends AbstractPluginModule {public List<SidebarMenuItem> getMenuItems(Project project) {List<SidebarMenuItem> menuItems = new ArrayList<>();if (!OneDev.getInstance(BuildMetricManager.class).getAccessibleReportNames(project, CoverageMetric.class).isEmpty()) {- String query = String.format("%s \"last month\"",- BuildMetricQuery.getRuleName(BuildMetricQueryParser.Since));- PageParameters params = CoverageStatsPage.paramsOf(project, query);+ PageParameters params = CoverageStatsPage.paramsOf(project);menuItems.add(new SidebarMenuItem.Page(null, "Coverage", CoverageStatsPage.class, params));}return menuItems;diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportModule.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportModule.javaindex 07b51e79a6..ede41d155e 100644--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportModule.java+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportModule.java@@ -21,8 +21,6 @@ import io.onedev.server.entitymanager.BuildMetricManager;import io.onedev.server.model.Build;import io.onedev.server.model.ProblemMetric;import io.onedev.server.model.Project;-import io.onedev.server.search.buildmetric.BuildMetricQuery;-import io.onedev.server.search.buildmetric.BuildMetricQueryParser;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebApplicationConfigurator;import io.onedev.server.web.mapper.DynamicPathPageMapper;@@ -49,9 +47,7 @@ public class ProblemReportModule extends AbstractPluginModule {public List<SidebarMenuItem> getMenuItems(Project project) {List<SidebarMenuItem> menuItems = new ArrayList<>();if (!OneDev.getInstance(BuildMetricManager.class).getAccessibleReportNames(project, ProblemMetric.class).isEmpty()) {- String query = String.format("%s \"last month\"",- BuildMetricQuery.getRuleName(BuildMetricQueryParser.Since));- PageParameters params = ProblemStatsPage.paramsOf(project, query);+ PageParameters params = ProblemStatsPage.paramsOf(project);menuItems.add(new SidebarMenuItem.Page(null, "Checkstyle", ProblemStatsPage.class, params));}return menuItems;diff --git a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReportModule.java b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReportModule.javaindex c801fd2f02..08db2cc856 100644--- a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReportModule.java+++ b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestReportModule.java@@ -15,8 +15,6 @@ import io.onedev.server.entitymanager.BuildMetricManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.UnitTestMetric;-import io.onedev.server.search.buildmetric.BuildMetricQuery;-import io.onedev.server.search.buildmetric.BuildMetricQueryParser;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebApplicationConfigurator;import io.onedev.server.web.mapper.DynamicPathPageMapper;@@ -74,11 +72,8 @@ public class UnitTestReportModule extends AbstractPluginModule {public List<SidebarMenuItem> getMenuItems(Project project) {List<SidebarMenuItem> menuItems = new ArrayList<>();if (!OneDev.getInstance(BuildMetricManager.class).getAccessibleReportNames(project, UnitTestMetric.class).isEmpty()) {- String query = String.format("%s \"last month\"",- BuildMetricQuery.getRuleName(BuildMetricQueryParser.Since));- PageParameters params = UnitTestStatsPage.paramsOf(project, query);- menuItems.add(new SidebarMenuItem.Page(null, "Unit Test",- UnitTestStatsPage.class, params));+ PageParameters params = UnitTestStatsPage.paramsOf(project);+ menuItems.add(new SidebarMenuItem.Page(null, "Unit Test", UnitTestStatsPage.class, params));}return menuItems;}