The Unified and Autonomous Development Platform
More SEO and bug fixes
Robin Shen41d49e8734a4
diff --git a/pom.xml b/pom.xmlindex 96545ff07d..4b0f7675f4 100644--- a/pom.xml+++ b/pom.xml@@ -9,7 +9,7 @@<version>1.0.5</version></parent><artifactId>server</artifactId>- <version>4.2.2</version>+ <version>4.2.3</version><packaging>pom</packaging><build><finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>@@ -477,7 +477,7 @@<dependency><groupId>com.thoughtworks.xstream</groupId><artifactId>xstream</artifactId>- <version>1.4.15</version>+ <version>1.4.16</version></dependency><dependency><groupId>com.joestelmach</groupId>diff --git a/server-core/pom.xml b/server-core/pom.xmlindex 774c5a359f..866182f4ed 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>4.2.2</version>+ <version>4.2.3</version></parent><build><plugins>diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex 0d6bb9e32c..86d3e2ed63 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -421,15 +421,16 @@ public class Build extends AbstractEntity implements Referenceable {return jobWorkspace;}- public void setJobWorkspace(String jobWorkspace) {+ public void setJobWorkspace(@Nullable String jobWorkspace) {this.jobWorkspace = jobWorkspace;}+ @Nullablepublic String getVersion() {return version;}- public void setVersion(String version) {+ public void setVersion(@Nullable String version) {this.version = version;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.javaindex d51178815a..cc34e357f6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java@@ -33,6 +33,11 @@ public abstract class AdministrationPage extends LayoutPage implements ScriptIderesponse.render(CssHeaderItem.forReference(new AdministrationResourceReference()));}+ @Override+ protected String getPageTitle() {+ return "Administration - OneDev";+ }+@Overridepublic ScriptIdentity getScriptIdentity() {return new SiteAdministrator();diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.javaindex 93670b41a9..2903fe7323 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java@@ -40,6 +40,7 @@ import org.apache.wicket.util.time.Duration;import org.apache.wicket.util.visit.IVisit;import org.apache.wicket.util.visit.IVisitor;import org.eclipse.jetty.servlet.ServletContextHandler;+import org.unbescape.javascript.JavaScriptEscape;import com.google.common.base.Splitter;@@ -192,16 +193,22 @@ public abstract class BasePage extends WebPage {super.onBeforeRender();}- public void pushState(IPartialPageRequestHandler partialPageRequestHandler, String url, Serializable data) {+ public void pushState(IPartialPageRequestHandler handler, String url, Serializable data) {String encodedData = new String(Base64.encodeBase64(CipherUtils.encrypt(SerializationUtils.serialize(data))));- String script = String.format("onedev.server.history.pushState('%s', '%s');", url, encodedData);- partialPageRequestHandler.prependJavaScript(script);+ String script = String.format("onedev.server.history.pushState('%s', '%s', '%s');",+ url, encodedData, JavaScriptEscape.escapeJavaScript(getPageTitle()));+ handler.prependJavaScript(script);}-- public void replaceState(IPartialPageRequestHandler partialPageRequestHandler, String url, Serializable data) {++ public void replaceState(IPartialPageRequestHandler handler, String url, Serializable data, @Nullable String title) {String encodedData = new String(Base64.encodeBase64(CipherUtils.encrypt(SerializationUtils.serialize(data))));- String script = String.format("onedev.server.history.replaceState('%s', '%s');", url, encodedData);- partialPageRequestHandler.prependJavaScript(script);+ String script = String.format("onedev.server.history.replaceState('%s', '%s', '%s');",+ url, encodedData, JavaScriptEscape.escapeJavaScript(title));+ handler.prependJavaScript(script);+ }++ public void replaceState(IPartialPageRequestHandler handler, String url, Serializable data) {+ replaceState(handler, url, null);}protected void onPopState(AjaxRequestTarget target, Serializable data) {@@ -263,7 +270,7 @@ public abstract class BasePage extends WebPage {throw new RestartResponseAtInterceptPageException(LoginPage.class);}- protected final String getPageTitle() {+ protected String getPageTitle() {return "OneDev - Super Easy All-in-One DevOps Platform";}diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.js b/server-core/src/main/java/io/onedev/server/web/page/base/base.jsindex 1b6e03e833..8d7021d5fa 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.js+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.js@@ -488,20 +488,22 @@ onedev.server = {url: window.location.href};},- pushState: function(url, data) {+ pushState: function(url, data, title) {var state = {data: data};onedev.server.history.current = {state: state, url: url};history.pushState(state, '', url);+ document.title = title;// Let others have a chance to do something before marking the page as visitedsetTimeout(function() {onedev.server.history.setVisited();}, 100);},- replaceState: function(url, data) {- var state = {data: data};+ replaceState: function(url, data, title) {+ var state = {data: data, title: title};onedev.server.history.current = {state: state, url: url};history.replaceState(state, '', url);+ document.title = title;// Let others have a chance to do something before marking the page as visitedsetTimeout(function() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.javaindex 7b42e835b8..b4392a06a8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java@@ -249,4 +249,9 @@ public class BuildListPage extends LayoutPage {return new Label(componentId, "Builds");}+ @Override+ protected String getPageTitle() {+ return "Builds - OneDev";+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.javaindex 69caba3034..4b46087d53 100644--- a/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java@@ -253,4 +253,9 @@ public class IssueListPage extends LayoutPage {return new Label(componentId, "Issues");}+ @Override+ protected String getPageTitle() {+ return "Issues - OneDev";+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/MyPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/MyPage.javaindex ebb3dc46a5..f961a19732 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/MyPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/MyPage.java@@ -21,4 +21,9 @@ public abstract class MyPage extends LayoutPage {throw new RestartResponseAtInterceptPageException(LoginPage.class);}+ @Override+ protected String getPageTitle() {+ return "My - OneDev";+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.javaindex a4430d26eb..9b6f171725 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java@@ -242,6 +242,11 @@ public class ProjectListPage extends LayoutPage {return paramsOf(query, page, expectedCount);}+ @Override+ protected String getPageTitle() {+ return "Projects - OneDev";+ }+@Overrideprotected Component newTopbarTitle(String componentId) {return new Label(componentId, "Projects");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 b5fd63a8f6..d8b1081fe5 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@@ -275,6 +275,11 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {return fragment;}+ @Override+ protected String getPageTitle() {+ return getProject().getName();+ }+protected abstract Component newProjectTitle(String componentId);protected Collection<Build> getBuilds(ObjectId commitId) {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 47c16304d7..edecc31244 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@@ -1226,7 +1226,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, Spublic State() {blobIdent = new BlobIdent();}-+}@Override@@ -1502,6 +1502,18 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S}}+ @Override+ protected String getPageTitle() {+ if (state.blobIdent.revision == null)+ return getProject().getName();+ else if (state.blobIdent.path == null)+ return state.blobIdent.revision + " - " + getProject().getName();+ else if (state.blobIdent.isFile())+ return state.blobIdent.getName() + " at " + state.blobIdent.revision + " - " + getProject().getName();+ else+ return state.blobIdent.path + " at " + state.blobIdent.revision + " - " + getProject().getName();+ }+@Overridepublic ScriptIdentity getScriptIdentity() {if (getBlobIdent().revision != null)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 e9f8932fba..231a089496 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@@ -882,4 +882,9 @@ public class ProjectBranchesPage extends ProjectPage {return new Label(componentId, "Branches");}+ @Override+ protected String getPageTitle() {+ return "Branches - " + getProject().getName();+ }+}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 876f4a8c1e..da86dd8f50 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@@ -250,4 +250,9 @@ public class ProjectBuildsPage extends ProjectPage {return new Label(componentId, "Builds");}+ @Override+ protected String getPageTitle() {+ return "Builds - " + getProject().getName();+ }+}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 534798271e..d7ff5f70d9 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@@ -567,4 +567,12 @@ public abstract class BuildDetailPage extends ProjectPagereturn fragment;}+ @Override+ protected String getPageTitle() {+ if (getBuild().getVersion() != null)+ return getBuild().getVersion() + " - Build #" + getBuild().getNumber() + " - " + getProject().getName();+ else+ return "Build #" + getBuild().getNumber() + " - " + getProject().getName();+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.javaindex 0b041507c8..51e57873db 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.java@@ -1,6 +1,8 @@package io.onedev.server.web.page.project.builds.detail.dashboard;import org.apache.wicket.RestartResponseException;+import org.apache.wicket.core.request.handler.PageProvider;+import org.apache.wicket.core.request.handler.RenderPageRequestHandler.RedirectPolicy;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.security.SecurityUtils;@@ -15,13 +17,15 @@ public class BuildDashboardPage extends BuildDetailPage {public BuildDashboardPage(PageParameters params) {super(params);+ PageProvider pageProvider;if (SecurityUtils.canAccessLog(getBuild()))- throw new RestartResponseException(BuildLogPage.class, BuildLogPage.paramsOf(getBuild()));+ pageProvider = new PageProvider(BuildLogPage.class, BuildLogPage.paramsOf(getBuild()));else if (getBuild().getArtifactsDir().exists())- throw new RestartResponseException(BuildArtifactsPage.class, BuildArtifactsPage.paramsOf(getBuild()));+ pageProvider = new PageProvider(BuildArtifactsPage.class, BuildArtifactsPage.paramsOf(getBuild()));else- throw new RestartResponseException(FixedIssuesPage.class, FixedIssuesPage.paramsOf(getBuild()));+ pageProvider = new PageProvider(FixedIssuesPage.class, FixedIssuesPage.paramsOf(getBuild()));+ throw new RestartResponseException(pageProvider, RedirectPolicy.NEVER_REDIRECT);}}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 dd57559081..f9ff8aed97 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@@ -240,4 +240,9 @@ public class ProjectCodeCommentsPage extends ProjectPage {return new Label(componentId, "<span class='text-truncate'>Code Comments</span>").setEscapeModelStrings(false);}+ @Override+ protected String getPageTitle() {+ return "Code Comments - " + getProject().getName();+ }+}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 52d9544a81..afdbf7bf9f 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@@ -846,4 +846,11 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annotareturn coverages;}+ @Override+ protected String getPageTitle() {+ return getCommit().getShortMessage()+ + " - Commit " + GitUtils.abbreviateSHA(getCommit().getName())+ + " - " + getProject().getName();+ }+}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 e7cecc65ab..8bdc662b25 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@@ -234,4 +234,9 @@ public class ProjectCommitsPage extends ProjectPage {return new Label(componentId, "Commits");}+ @Override+ protected String getPageTitle() {+ return "Commits - " + getProject().getName();+ }+}\ 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 d32693d996..cbac7f0bc7 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@@ -932,4 +932,9 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Annreturn coverages;}+ @Override+ protected String getPageTitle() {+ return "Code Compare - " + getProject().getName();+ }+}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 dd317dec90..1892317086 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@@ -2,6 +2,8 @@ package io.onedev.server.web.page.project.dashboard;import org.apache.wicket.Component;import org.apache.wicket.RestartResponseException;+import org.apache.wicket.core.request.handler.PageProvider;+import org.apache.wicket.core.request.handler.RenderPageRequestHandler.RedirectPolicy;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -16,11 +18,12 @@ public class ProjectDashboardPage extends ProjectPage {public ProjectDashboardPage(PageParameters params) {super(params);+ PageProvider pageProvider;if (SecurityUtils.canReadCode(getProject()))- throw new RestartResponseException(ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject()));+ pageProvider = new PageProvider(ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject()));else- throw new RestartResponseException(ProjectIssueListPage.class, ProjectIssueListPage.paramsOf(getProject()));-+ pageProvider = new PageProvider(ProjectIssueListPage.class, ProjectIssueListPage.paramsOf(getProject()));+ throw new RestartResponseException(pageProvider, RedirectPolicy.NEVER_REDIRECT);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.javaindex 8bd87f4c8e..f9fcbe56a8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.java@@ -42,4 +42,9 @@ public abstract class ProjectIssuesPage extends ProjectPage implements ScriptIdereturn new SiteAdministrator();}+ @Override+ protected String getPageTitle() {+ return "Issues - " + getProject().getName();+ }+}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 ad90e5252d..93aa7d49a4 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@@ -999,4 +999,9 @@ public class IssueBoardsPage extends ProjectIssuesPage {return new Label(componentId, "Issue Boards");}+ @Override+ protected String getPageTitle() {+ return "Issue Boards - " + getProject().getName();+ }+}diff --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 f492eddf4c..a47443d4c1 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@@ -313,4 +313,9 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Inputreturn fragment;}+ @Override+ protected String getPageTitle() {+ return getIssue().getTitle() + " - Issue #" + getIssue().getNumber() + " - " + getProject().getName();+ }+}diff --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 aed5614eaf..7a86cce8d3 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@@ -232,4 +232,9 @@ public class MilestoneDetailPage extends ProjectPage implements ScriptIdentityAwreturn fragment;}+ @Override+ protected String getPageTitle() {+ return "Milestone " + getMilestone().getName() + " - " + getProject().getName();+ }+}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 3a9791f478..6f8c487025 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@@ -378,4 +378,9 @@ public class MilestoneListPage extends ProjectPage {return new Label(componentId, "Milestones");}+ @Override+ protected String getPageTitle() {+ return "Milestones - " + getProject().getName();+ }+}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 883bbc48fe..bad4216a50 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@@ -258,4 +258,9 @@ public class ProjectPullRequestsPage extends ProjectPage {return new Label(componentId, "<span class='text-nowrap'>Pull Requests</span>").setEscapeModelStrings(false);}+ @Override+ protected String getPageTitle() {+ return "Pull Requests - " + getProject().getName();+ }+}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 9fcce5a798..ca8a47ff15 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@@ -1537,4 +1537,9 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRreturn fragment;}+ @Override+ protected String getPageTitle() {+ return getPullRequest().getTitle() + " - Pull Request #" + getPullRequest().getNumber() + " - " + getProject().getName();+ }+}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 74ebacb9f3..a11c3902ab 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@@ -26,4 +26,9 @@ public abstract class ProjectSettingPage extends ProjectPage {response.render(CssHeaderItem.forReference(new ProjectSettingResourceReference()));}+ @Override+ protected String getPageTitle() {+ return "Settings - " + getProject().getName();+ }+}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 a10b653f09..7652a73a6e 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@@ -30,4 +30,9 @@ public abstract class ProjectStatsPage extends ProjectPage {response.render(JavaScriptHeaderItem.forReference(new ProjectStatsResourceReference()));}+ @Override+ protected String getPageTitle() {+ return "Statistics - " + getProject().getName();+ }+}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 d6093bf6f0..b460dbb164 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@@ -480,4 +480,9 @@ public class ProjectTagsPage extends ProjectPage {return new Label(componentId, "Tags");}+ @Override+ protected String getPageTitle() {+ return "Tags - " + getProject().getName();+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.javaindex 7aecb02a9f..1dc00affd8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java@@ -227,6 +227,11 @@ public class PullRequestListPage extends LayoutPage {return params;}+ @Override+ protected String getPageTitle() {+ return "Pull Requests - OneDev";+ }+public static PageParameters paramsOf(int page) {String query = null;User user = SecurityUtils.getUser();diff --git a/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.java b/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.javaindex 7a29f7f6a1..a670ef387f 100644--- a/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.java@@ -12,6 +12,8 @@ import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.core.request.handler.IPageRequestHandler;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.protocol.ws.api.registry.PageIdKey;+import org.apache.wicket.request.IRequestHandler;+import org.apache.wicket.request.IRequestHandlerDelegate;import org.apache.wicket.request.Url;import org.apache.wicket.request.cycle.RequestCycle;@@ -28,11 +30,15 @@ public class WicketUtils {@Nullablepublic static Page getPage() {- if (RequestCycle.get() != null && RequestCycle.get().getActiveRequestHandler() instanceof IPageRequestHandler) {- return (Page) ((IPageRequestHandler) RequestCycle.get().getActiveRequestHandler()).getPage();- } else {- return null;- }+ RequestCycle requestCycle = RequestCycle.get();+ if (requestCycle != null) {+ IRequestHandler requestHandler = requestCycle.getActiveRequestHandler();+ if (requestHandler instanceof IRequestHandlerDelegate)+ requestHandler = ((IRequestHandlerDelegate) requestHandler).getDelegateHandler();+ if (requestHandler instanceof IPageRequestHandler)+ return (Page) ((IPageRequestHandler) requestHandler).getPage();+ }+ return null;}@Nullablediff --git a/server-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java b/server-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.javaindex 5391456de9..d1c5637f2f 100644--- a/server-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java+++ b/server-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java@@ -285,44 +285,49 @@ public class ServletWebResponse extends WebResponse}else{- httpServletResponse.resetBuffer();- httpServletResponse.setContentType("text/html");-- String content = String.format(""- + "<!doctype html>"- + "<html lang='en'>"- + "<head>"- + "<script type='application/javascript'>"- + " function getKey(url) {"- + " var key = url;"- + " if (key.indexOf('#') != -1)"- + " key = key.substr(0, key.indexOf('#'));"- + " return key.substr(key.indexOf(':'), key.length);"- + " }"- + " if (location.hash) {"- + " var url = location.pathname;"- + " if (location.search)"- + " url += location.search;"- + " url += location.hash;"- + " sessionStorage.setItem(getKey(url), location.hash);"- + " }"- + " var redirect = '%s';"- + " var key = getKey(redirect);"- + " if (redirect.indexOf('#') == -1) {"- + " var hash = sessionStorage.getItem(key);"- + " if (hash) "- + " redirect += hash;"- + " }"- + " sessionStorage.removeItem(key);"- + " window.location.replace(redirect);"- + "</script>"- + "</head>"- + "<body>"- + "<a href='%s'>content</a>" // add this for SEO- + "</body>"- + "</html>", url, url);- httpServletResponse.getOutputStream().write(content.getBytes());- httpServletResponse.getOutputStream().close();+ String userAgent = webRequest.getContainerRequest().getHeader("User-Agent").toLowerCase();+ if (userAgent.contains("bot") || userAgent.contains("crawler")+ || userAgent.contains("spider") || userAgent.contains("crawling")) {+ httpServletResponse.sendRedirect(url);+ } else {+ httpServletResponse.resetBuffer();+ httpServletResponse.setContentType("text/html");++ String content = String.format(""+ + "<!doctype html>"+ + "<html lang='en'>"+ + "<head>"+ + "<script type='application/javascript'>"+ + " function getKey(url) {"+ + " var key = url;"+ + " if (key.indexOf('#') != -1)"+ + " key = key.substr(0, key.indexOf('#'));"+ + " if (key.indexOf(':') != -1)"+ + " key = key.substr(key.indexOf(':'), key.length);"+ + " return key;"+ + " }"+ + " if (location.hash) {"+ + " var url = location.pathname;"+ + " if (location.search)"+ + " url += location.search;"+ + " url += location.hash;"+ + " sessionStorage.setItem(getKey(url), location.hash);"+ + " }"+ + " var redirect = '%s';"+ + " var key = getKey(redirect);"+ + " if (redirect.indexOf('#') == -1) {"+ + " var hash = sessionStorage.getItem(key);"+ + " if (hash) "+ + " redirect += hash;"+ + " }"+ + " sessionStorage.removeItem(key);"+ + " window.location.replace(redirect);"+ + "</script>"+ + "</head>"+ + "</html>", url);+ httpServletResponse.getOutputStream().write(content.getBytes());+ httpServletResponse.getOutputStream().close();+ }}}catch (IOException e)diff --git a/server-plugin/pom.xml b/server-plugin/pom.xmlindex c225d357c2..915c800af7 100644--- a/server-plugin/pom.xml+++ b/server-plugin/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>4.2.2</version>+ <version>4.2.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xmlindex 9c5036f331..1f7858425c 100644--- a/server-plugin/server-plugin-archetype/pom.xml+++ b/server-plugin/server-plugin-archetype/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.2.2</version>+ <version>4.2.3</version></parent><build><resources>diff --git a/server-plugin/server-plugin-authenticator-ldap/pom.xml b/server-plugin/server-plugin-authenticator-ldap/pom.xmlindex b17cd62c8a..c0ecdc94c3 100644--- a/server-plugin/server-plugin-authenticator-ldap/pom.xml+++ b/server-plugin/server-plugin-authenticator-ldap/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.2.2</version>+ <version>4.2.3</version></parent><properties><moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-gradle/pom.xml b/server-plugin/server-plugin-buildspec-gradle/pom.xmlindex fdbf0ca6d1..8caae4c7eb 100644--- a/server-plugin/server-plugin-buildspec-gradle/pom.xml+++ b/server-plugin/server-plugin-buildspec-gradle/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.2.2</version>+ <version>4.2.3</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.gradle.GradleModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-maven/pom.xml b/server-plugin/server-plugin-buildspec-maven/pom.xmlindex 0ad3e80714..78a6abe043 100644--- a/server-plugin/server-plugin-buildspec-maven/pom.xml+++ b/server-plugin/server-plugin-buildspec-maven/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.2.2</version>+ <version>4.2.3</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.maven.MavenModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-node/pom.xml b/server-plugin/server-plugin-buildspec-node/pom.xmlindex 458d690128..7f75b9f963 100644--- a/server-plugin/server-plugin-buildspec-node/pom.xml+++ b/server-plugin/server-plugin-buildspec-node/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.2.2</version>+ <version>4.2.3</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-docker/pom.xml b/server-plugin/server-plugin-executor-docker/pom.xmlindex f90f74a62b..c228cfad05 100644--- a/server-plugin/server-plugin-executor-docker/pom.xml+++ b/server-plugin/server-plugin-executor-docker/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.2.2</version>+ <version>4.2.3</version></parent><properties><moduleClass>io.onedev.server.plugin.docker.DockerModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xmlindex 1f6843aa2a..86903838ad 100644--- a/server-plugin/server-plugin-executor-kubernetes/pom.xml+++ b/server-plugin/server-plugin-executor-kubernetes/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.2.2</version>+ <version>4.2.3</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>diff --git a/server-plugin/server-plugin-report-checkstyle/pom.xml b/server-plugin/server-plugin-report-checkstyle/pom.xmlindex e9f969d19d..37d1312666 100644--- a/server-plugin/server-plugin-report-checkstyle/pom.xml+++ b/server-plugin/server-plugin-report-checkstyle/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.2.2</version>+ <version>4.2.3</version></parent><properties><moduleClass>org.server.plugin.report.checkstyle.CheckstylePluginModule</moduleClass>diff --git a/server-plugin/server-plugin-report-clover/pom.xml b/server-plugin/server-plugin-report-clover/pom.xmlindex 6b81932ff4..3d03db2e8d 100644--- a/server-plugin/server-plugin-report-clover/pom.xml+++ b/server-plugin/server-plugin-report-clover/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.2.2</version>+ <version>4.2.3</version></parent><properties><moduleClass>org.server.plugin.report.clover.CloverPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-report-jest/pom.xml b/server-plugin/server-plugin-report-jest/pom.xmlindex aca5a0b134..88e0cce3e6 100644--- a/server-plugin/server-plugin-report-jest/pom.xml+++ b/server-plugin/server-plugin-report-jest/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.2.2</version>+ <version>4.2.3</version></parent><properties><moduleClass>io.onedev.server.plugin.report.jest.JestTestReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xmlindex 7f97d93107..0d8289f060 100644--- a/server-plugin/server-plugin-report-markdown/pom.xml+++ b/server-plugin/server-plugin-report-markdown/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.2.2</version>+ <version>4.2.3</version></parent><properties><moduleClass>io.onedev.server.plugin.report.markdown.MarkdownReportModule</moduleClass>diff --git a/server-plugin/server-plugin-sso-openid/pom.xml b/server-plugin/server-plugin-sso-openid/pom.xmlindex f5f3c744de..91a92d2b53 100644--- a/server-plugin/server-plugin-sso-openid/pom.xml+++ b/server-plugin/server-plugin-sso-openid/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>4.2.2</version>+ <version>4.2.3</version></parent><dependencies><dependency>diff --git a/server-product/pom.xml b/server-product/pom.xmlindex 9f337ee8a6..d9d620098b 100644--- a/server-product/pom.xml+++ b/server-product/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>4.2.2</version>+ <version>4.2.3</version></parent><dependencies><dependency>