The Unified and Autonomous Development Platform
Minor adjust of request list page
robin shen5d76ed96375d
diff --git a/web/src/main/java/com/gitplex/server/web/page/base/base.css b/web/src/main/java/com/gitplex/server/web/page/base/base.cssindex 6676aa0dbc..e880cc4ccd 100644--- a/web/src/main/java/com/gitplex/server/web/page/base/base.css+++ b/web/src/main/java/com/gitplex/server/web/page/base/base.css@@ -258,6 +258,9 @@ form>.test-feedback {.input-group .select2-container.form-control .select2-choices {border-radius: 0 4px 4px 0;}+.select2-container .avatar {+ margin-right: 4px;+}/* Ajax Loading Indicator */#ajax-loading-indicator {diff --git a/web/src/main/java/com/gitplex/server/web/page/dashboard/dashboard.css b/web/src/main/java/com/gitplex/server/web/page/dashboard/dashboard.cssindex 133d5a0814..af824e2fc1 100644--- a/web/src/main/java/com/gitplex/server/web/page/dashboard/dashboard.css+++ b/web/src/main/java/com/gitplex/server/web/page/dashboard/dashboard.css@@ -8,6 +8,7 @@}#dashboard .summary .help-block {margin-bottom: 20px;+ margin-left: 4px;}#dashboard .summary a {color: #444;diff --git a/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.java b/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.javaindex 91456017d9..7403dfc3a5 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.java@@ -601,7 +601,7 @@ public class ProjectBranchesPage extends ProjectPage {Fragment bodyFrag = new Fragment("body", "openRequestsFrag", ProjectBranchesPage.this);SearchOption searchOption = new SearchOption();searchOption.setStatus(Status.OPEN);- searchOption.setBranch(branch);+ searchOption.setTargetBranch(branch);PageParameters params = RequestListPage.paramsOf(getProject(), searchOption, new SortOption());bodyFrag.add(new ViewStateAwarePageLink<Void>("openRequests", RequestListPage.class, params));bodyFrag.add(new Label("branch", branch));diff --git a/web/src/main/java/com/gitplex/server/web/page/project/commit/ProjectCommitsPage.java b/web/src/main/java/com/gitplex/server/web/page/project/commit/ProjectCommitsPage.javaindex 25dc9f2205..d5d4b1c279 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/commit/ProjectCommitsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/commit/ProjectCommitsPage.java@@ -45,15 +45,12 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.unbescape.java.JavaEscape;-import com.gitplex.server.GitPlex;import com.gitplex.server.git.BlobIdent;import com.gitplex.server.git.GitUtils;import com.gitplex.server.git.command.RevListCommand;-import com.gitplex.server.manager.WorkExecutor;import com.gitplex.server.model.Project;import com.gitplex.server.model.support.ProjectAndRevision;import com.gitplex.server.util.StringUtils;-import com.gitplex.server.util.concurrent.PrioritizedCallable;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;import com.gitplex.server.web.component.avatar.ContributorAvatars;@@ -82,8 +79,6 @@ public class ProjectCommitsPage extends ProjectPage {private static final Logger logger = LoggerFactory.getLogger(ProjectCommitsPage.class);- private static final int LOG_PRIORITY = 1;-private static final String GIT_ERROR_START = "Command error output: ";private static final int COUNT = 50;@@ -172,15 +167,7 @@ public class ProjectCommitsPage extends ProjectPage {if (command.revisions().isEmpty() && state.compareWith != null)command.revisions(Lists.newArrayList(state.compareWith));- commitHashes = GitPlex.getInstance(WorkExecutor.class).submit(new PrioritizedCallable<List<String>>(LOG_PRIORITY) {-- @Override- public List<String> call() throws Exception {- return command.call();- }-- }).get();-+ commitHashes = command.call();} catch (Exception e) {if (e.getMessage() != null && e.getMessage().contains(GIT_ERROR_START)) {queryForm.error(StringUtils.substringAfter(e.getMessage(), GIT_ERROR_START));diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/NewRequestPage.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/NewRequestPage.javaindex 4518db3674..5d88bcb780 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/NewRequestPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/NewRequestPage.java@@ -75,7 +75,6 @@ import com.gitplex.server.web.page.security.LoginPage;import com.gitplex.server.web.websocket.CommitIndexedRegion;import com.gitplex.server.web.websocket.PageDataChanged;import com.gitplex.server.web.websocket.WebSocketRegion;-import com.google.common.base.Preconditions;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;@@ -585,18 +584,7 @@ public class NewRequestPage extends ProjectPage implements MarkSupport {@Overridepublic String getObject() {- PullRequest request = getPullRequest();- if (request.getTitle() == null) {- List<RevCommit> commits = commitsModel.getObject();- Preconditions.checkState(!commits.isEmpty());- if (commits.size() == 1) {- request.setTitle(commits.get(0).getShortMessage());- } else if (!request.getSourceBranch().equals("master")- && !request.getSourceBranch().equals(request.getTargetBranch())) {- request.setTitle(request.getSourceBranch());- }- }- return request.getTitle();+ return getPullRequest().getTitle();}@Override@@ -748,8 +736,11 @@ public class NewRequestPage extends ProjectPage implements MarkSupport {@Overridepublic Collection<WebSocketRegion> getWebSocketRegions() {Collection<WebSocketRegion> regions = super.getWebSocketRegions();- regions.add(new CommitIndexedRegion(getPullRequest().getBaseCommit()));- regions.add(new CommitIndexedRegion(getPullRequest().getHeadCommit()));+ PullRequest request = getPullRequest();+ if (request != null) {+ regions.add(new CommitIndexedRegion(request.getBaseCommit()));+ regions.add(new CommitIndexedRegion(request.getHeadCommit()));+ }return regions;}diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/CodeCommentsPage.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/CodeCommentsPage.htmlindex df46724892..bc6e15aecf 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/CodeCommentsPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/CodeCommentsPage.html@@ -12,7 +12,7 @@</div><form wicket:id="filterForm"><div wicket:id="editor" class="no-autofocus"></div>- <button type="submit" class="btn btn-primary"><i class="fa fa-search"></i> Search</button>+ <button type="submit" class="btn btn-primary"><i class="fa fa-search"></i> Filter</button></form></div></td>diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.htmlindex 4e17c96eb3..eb3a3d893b 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.html@@ -12,7 +12,7 @@<div class="body"><form wicket:id="filterForm"><div wicket:id="editor" class="no-autofocus"></div>- <button type="submit" class="btn btn-primary"><i class="fa fa-search"></i> Search</button>+ <button type="submit" class="btn btn-primary"><i class="fa fa-search"></i> Filter</button></form></div></td>diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.javaindex 07df779676..f83daec83c 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.java@@ -49,7 +49,6 @@ import com.gitplex.server.web.editable.BeanContext;import com.gitplex.server.web.page.project.ProjectPage;import com.gitplex.server.web.page.project.pullrequest.newrequest.NewRequestPage;import com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;-import com.gitplex.server.web.page.project.pullrequest.requestlist.SearchOption.Direction;import com.gitplex.server.web.page.project.pullrequest.requestlist.SearchOption.Status;import com.gitplex.server.web.util.DateUtils;@@ -63,8 +62,8 @@ public class RequestListPage extends ProjectPage {static {sortNames.put(new SortOption("submitDate", false), "Newest");sortNames.put(new SortOption("submitDate", true), "Oldest");- sortNames.put(new SortOption("lastEventDate", false), "Recently updated");- sortNames.put(new SortOption("lastEventDate", true), "Least recently updated");+ sortNames.put(new SortOption("lastEvent.date", false), "Recently updated");+ sortNames.put(new SortOption("lastEvent.date", true), "Least recently updated");}private SearchOption searchOption;@@ -95,7 +94,30 @@ public class RequestListPage extends ProjectPage {@Overridepublic String getLabel() {- return "Open requests submitted by me";+ return "Open requests";+ }++ @Override+ public AbstractLink newLink(String id) {+ return new Link<Void>(id) {++ @Override+ public void onClick() {+ searchOption = new SearchOption();+ searchOption.setStatus(Status.OPEN);++ setResponsePage(RequestListPage.class, paramsOf(getProject(), searchOption, sortOption));+ }++ };+ }++ });+ menuItems.add(new MenuItem() {++ @Override+ public String getLabel() {+ return "My open requests";}@Override@@ -115,78 +137,54 @@ public class RequestListPage extends ProjectPage {}});- }- menuItems.add(new MenuItem() {+ menuItems.add(new MenuItem() {- @Override- public String getLabel() {- return "All open requests";- }+ @Override+ public String getLabel() {+ return "Closed requests";+ }- @Override- public AbstractLink newLink(String id) {- return new Link<Void>(id) {+ @Override+ public AbstractLink newLink(String id) {+ return new Link<Void>(id) {- @Override- public void onClick() {- searchOption = new SearchOption();- searchOption.setStatus(Status.OPEN);+ @Override+ public void onClick() {+ searchOption = new SearchOption();+ searchOption.setStatus(Status.CLOSED);++ setResponsePage(RequestListPage.class, paramsOf(getProject(), searchOption, sortOption));+ }- setResponsePage(RequestListPage.class, paramsOf(getProject(), searchOption, sortOption));- }-- };- }-- });- menuItems.add(new MenuItem() {+ };+ }++ });+ menuItems.add(new MenuItem() {- @Override- public String getLabel() {- return "Incoming open requests";- }+ @Override+ public String getLabel() {+ return "My closed requests";+ }- @Override- public AbstractLink newLink(String id) {- return new Link<Void>(id) {-- @Override- public void onClick() {- searchOption = new SearchOption();- searchOption.setDirection(Direction.INCOMING);- searchOption.setStatus(Status.OPEN);-- setResponsePage(RequestListPage.class, paramsOf(getProject(), searchOption, sortOption));- }-- };- }-- });- menuItems.add(new MenuItem() {+ @Override+ public AbstractLink newLink(String id) {+ return new Link<Void>(id) {- @Override- public String getLabel() {- return "Outgoing open requests";- }+ @Override+ public void onClick() {+ searchOption = new SearchOption();+ searchOption.setStatus(Status.CLOSED);+ searchOption.setSubmitterName(userName);- @Override- public AbstractLink newLink(String id) {- return new Link<Void>(id) {-- @Override- public void onClick() {- searchOption = new SearchOption();- searchOption.setDirection(Direction.OUTGOING);- searchOption.setStatus(Status.OPEN);+ setResponsePage(RequestListPage.class, paramsOf(getProject(), searchOption, sortOption));+ }- setResponsePage(RequestListPage.class, paramsOf(getProject(), searchOption, sortOption));- }-- };- }-- });+ };+ }++ });+ }return menuItems;}diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/SearchOption.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/SearchOption.javaindex 43c9033911..b0668d21e5 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/SearchOption.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/SearchOption.java@@ -1,7 +1,5 @@package com.gitplex.server.web.page.project.pullrequest.requestlist;-import static com.gitplex.server.model.PullRequest.CriterionHelper.ofSource;-import static com.gitplex.server.model.PullRequest.CriterionHelper.ofSourceProject;import static com.gitplex.server.model.PullRequest.CriterionHelper.ofTarget;import static com.gitplex.server.model.PullRequest.CriterionHelper.ofTargetProject;@@ -17,16 +15,14 @@ import com.gitplex.server.model.Project;import com.gitplex.server.model.PullRequest;import com.gitplex.server.model.support.ProjectAndBranch;import com.gitplex.server.persistence.dao.EntityCriteria;-import com.gitplex.server.util.editable.annotation.UserChoice;import com.gitplex.server.util.editable.annotation.BranchChoice;import com.gitplex.server.util.editable.annotation.Editable;+import com.gitplex.server.util.editable.annotation.UserChoice;@SuppressWarnings("serial")@Editablepublic class SearchOption implements Serializable {- private static final String PARAM_DIRECTION = "direction";-private static final String PARAM_STATUS = "status";private static final String PARAM_SUBMITTER = "submitter";@@ -39,17 +35,13 @@ public class SearchOption implements Serializable {private static final String PARAM_END_DATE = "end";- public enum Direction {INCOMING, OUTGOING, ALL};-public enum Status {OPEN, CLOSED, ALL};- private Direction direction = Direction.ALL;-private Status status = Status.OPEN;private String submitterName;- private String branch;+ private String targetBranch;private String title;@@ -57,16 +49,6 @@ public class SearchOption implements Serializable {private Date endDate;- @Editable(order=50)- @NotNull- public Direction getDirection() {- return direction;- }-- public void setDirection(Direction direction) {- this.direction = direction;- }-@Editable(order=100)@NotNullpublic Status getStatus() {@@ -89,12 +71,12 @@ public class SearchOption implements Serializable {@Editable(order=400, description="Target branch for incoming request, or source branch for outgoing request")@BranchChoice- public String getBranch() {- return branch;+ public String getTargetBranch() {+ return targetBranch;}- public void setBranch(String branch) {- this.branch = branch;+ public void setTargetBranch(String targetBranch) {+ this.targetBranch = targetBranch;}@Editable(order=500, name="Title Containing")@@ -128,17 +110,13 @@ public class SearchOption implements Serializable {}public SearchOption(PageParameters params) {- String value = params.get(PARAM_DIRECTION).toString();- if (value != null)- direction = Direction.valueOf(value);-- value = params.get(PARAM_STATUS).toString();+ String value = params.get(PARAM_STATUS).toString();if (value != null)status = Status.valueOf(value);submitterName = params.get(PARAM_SUBMITTER).toString();- branch = params.get(PARAM_BRANCH).toString();+ targetBranch = params.get(PARAM_BRANCH).toString();title = params.get(PARAM_TITLE).toString();value = params.get(PARAM_BEGIN_DATE).toString();@@ -152,23 +130,10 @@ public class SearchOption implements Serializable {public EntityCriteria<PullRequest> getCriteria(Project project) {EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);- if (direction == Direction.INCOMING) {- if (branch != null)- criteria.add(ofTarget(new ProjectAndBranch(project, branch)));- else- criteria.add(ofTargetProject(project));- } else if (direction == Direction.OUTGOING) {- if (branch != null)- criteria.add(ofSource(new ProjectAndBranch(project, branch)));- else- criteria.add(ofSourceProject(project));- } else if (branch != null) {- criteria.add(Restrictions.or(- ofTarget(new ProjectAndBranch(project, branch)),- ofSource(new ProjectAndBranch(project, branch))));- } else {- criteria.add(Restrictions.or(ofTargetProject(project), ofSourceProject(project)));- }+ if (targetBranch != null)+ criteria.add(ofTarget(new ProjectAndBranch(project, targetBranch)));+ else+ criteria.add(ofTargetProject(project));if (status == Status.OPEN)criteria.add(PullRequest.CriterionHelper.ofOpen());@@ -188,12 +153,11 @@ public class SearchOption implements Serializable {}public void fillPageParams(PageParameters params) {- params.set(PARAM_DIRECTION, direction.name());params.set(PARAM_STATUS, status.name());if (submitterName != null)params.set(PARAM_SUBMITTER, submitterName);- if (branch != null)- params.set(PARAM_BRANCH, branch);+ if (targetBranch != null)+ params.set(PARAM_BRANCH, targetBranch);if (title != null)params.set(PARAM_TITLE, title);if (beginDate != null)diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/request-list.css b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/request-list.cssindex ee8642bed4..a1ea7cd967 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/request-list.css+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/request-list.css@@ -31,6 +31,12 @@padding: 8px 8px 0 8px;border-left: 4px solid white;}+#request-list td.request img.avatar {+ width: 20px;+ height: 20px;+ vertical-align: text-top;+}+#request-list td.request.new {border-left: 4px solid #4667EE;}@@ -68,6 +74,4 @@#request-list td.result .norecords-td {padding: 20px;font-size: 20px;- text-align: center;- font-style: italic;}