The Unified and Autonomous Development Platform
Fix issue #721 - Changing filter should reset to show all files in diff view
Robin Shen22caad9cc280
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex b8d5abc7d5..9d45f70554 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -427,6 +427,10 @@ public abstract class RevisionDiffPanel extends Panel {cookie.setPath("/");response.addCookie(cookie);target.add(body);++ for (DiffViewMode each: DiffViewMode.values())+ target.add(getParent().get(each.name().toLowerCase()));+((BasePage)getPage()).resizeWindow(target);}@@ -670,7 +674,7 @@ public abstract class RevisionDiffPanel extends Panel {if (index != -1)return "File " + (index +1) + " of " + getTotalChanges().size();else- return getCurrentFile();+ return "File '" + getCurrentFile() + "' not found in change set";}}));@@ -1311,7 +1315,6 @@ public abstract class RevisionDiffPanel extends Panel {if (blobDiffPanel != null)blobDiffPanel.onCommentClosed(target);annotationSupport.onCommentClosed(target);- target.prependJavaScript("$('body').removeClass('hide-side-info');");} else {Mark mark = annotationSupport.getMark();if (mark != null) {@@ -1321,6 +1324,7 @@ public abstract class RevisionDiffPanel extends Panel {annotationSupport.onUnmark(target);}}+ target.prependJavaScript("$('body').removeClass('hide-side-info');");}});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 3a4d4e5d8d..3c13940fcb 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@@ -486,6 +486,7 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota@Overridepublic void setObject(String object) {state.pathFilter = object;+ state.currentFile = null;pushState(RequestCycle.get().find(AjaxRequestTarget.class));}diff --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 c5b22ae26c..fa0043f777 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@@ -603,6 +603,7 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Ann@Overridepublic void setObject(String object) {state.pathFilter = object;+ state.currentFile = null;pushState(RequestCycle.get().find(AjaxRequestTarget.class));}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 e9f1ffb88b..1f7c651457 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@@ -505,6 +505,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Anno@Overridepublic void setObject(String object) {+ currentFile = null;pathFilter = object;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.javaindex 324a6bb2b2..53260890ce 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java@@ -682,6 +682,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev@Overridepublic void setObject(String object) {state.pathFilter = object;+ state.currentFile = null;pushState(RequestCycle.get().find(AjaxRequestTarget.class));}