Skip to content

The Unified and Autonomous Development Platform

Fix some bugs

robin shena5b8bc4de577
diff --git a/core/src/main/java/com/gitplex/server/manager/ReviewManager.java b/core/src/main/java/com/gitplex/server/manager/ReviewManager.java
index 17ff396339..6736959b59 100644
--- a/core/src/main/java/com/gitplex/server/manager/ReviewManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/ReviewManager.java
@@ -2,6 +2,8 @@ package com.gitplex.server.manager;
import java.util.List;
+import javax.annotation.Nullable;
+
import org.eclipse.jgit.lib.ObjectId;
import com.gitplex.server.model.User;
@@ -16,6 +18,9 @@ public interface ReviewManager extends EntityManager<Review> {
@Override
void save(Review review);
+ @Nullable
+ Review find(PullRequest request, User user, String commit);
+
/**
* Find list of reviews ordered by review date for specified pull request.
*
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
index 160fadfcc6..f849926549 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
@@ -417,21 +417,21 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
closeAsMerged(request, true, null);
} else {
MergePreview mergePreview = request.getMergePreview();
- ReviewStatus checkStatus = request.getReviewStatus();
+ ReviewStatus reviewStatus = request.getReviewStatus();
for (ReviewInvitation invitation: request.getReviewInvitations()) {
- if (checkStatus.getAwaitingReviewers().contains(invitation.getUser()))
+ if (reviewStatus.getAwaitingReviewers().contains(invitation.getUser()))
reviewInvitationManager.save(invitation);
}
boolean hasDisapprovals = false;
- for (Review review: checkStatus.getEffectiveReviews().values()) {
+ for (Review review: reviewStatus.getEffectiveReviews().values()) {
if (!review.isApproved()) {
hasDisapprovals = true;
break;
}
}
- if (!hasDisapprovals && checkStatus.getAwaitingReviewers().isEmpty()
+ if (!hasDisapprovals && reviewStatus.getAwaitingReviewers().isEmpty()
&& mergePreview != null && mergePreview.getMerged() != null) {
merge(request);
}
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewManager.java
index d820db4d60..f490c05637 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewManager.java
@@ -58,8 +58,7 @@ import com.gitplex.server.util.facade.UserFacade;
import com.gitplex.server.util.reviewappointment.ReviewAppointment;
@Singleton
-public class DefaultReviewManager extends AbstractEntityManager<Review>
- implements ReviewManager {
+public class DefaultReviewManager extends AbstractEntityManager<Review> implements ReviewManager {
private static final Logger logger = LoggerFactory.getLogger(DefaultReviewManager.class);
@@ -461,5 +460,15 @@ public class DefaultReviewManager extends AbstractEntityManager<Review>
}
}
+ }
+
+ @Override
+ public Review find(PullRequest request, User user, String commit) {
+ EntityCriteria<Review> criteria = EntityCriteria.of(Review.class);
+ criteria.add(Restrictions.eq("user", user))
+ .add(Restrictions.eq("request", request))
+ .add(Restrictions.eq("commit", commit));
+ return find(criteria);
}
+
}
diff --git a/rest/src/main/java/com/gitplex/server/rest/ProjectResource.java b/rest/src/main/java/com/gitplex/server/rest/ProjectResource.java
index 2878b4f9e2..38e0e78d0c 100644
--- a/rest/src/main/java/com/gitplex/server/rest/ProjectResource.java
+++ b/rest/src/main/java/com/gitplex/server/rest/ProjectResource.java
@@ -1,9 +1,5 @@
package com.gitplex.server.rest;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.ws.rs.Consumes;
@@ -16,12 +12,10 @@ import javax.ws.rs.core.MediaType;
import org.apache.shiro.authz.UnauthenticatedException;
import org.apache.shiro.authz.UnauthorizedException;
-import org.hibernate.criterion.Restrictions;
import com.gitplex.server.manager.ProjectManager;
import com.gitplex.server.model.Project;
import com.gitplex.server.persistence.dao.Dao;
-import com.gitplex.server.persistence.dao.EntityCriteria;
import com.gitplex.server.rest.jersey.ValidQueryParams;
import com.gitplex.server.security.SecurityUtils;
@@ -54,29 +48,11 @@ public class ProjectResource {
@ValidQueryParams
@GET
- public Collection<Project> query(@QueryParam("userId") Long userId, @QueryParam("name") String name,
- @QueryParam("path") String path) {
-
- List<Project> projects = new ArrayList<>();
-
- EntityCriteria<Project> criteria = EntityCriteria.of(Project.class);
- if (path != null) {
- Project project = projectManager.find(path);
- if (project != null)
- projects.add(project);
- } else {
- if (userId != null)
- criteria.add(Restrictions.eq("user.id", userId));
- if (name != null)
- criteria.add(Restrictions.eq("name", name));
- projects.addAll(dao.findAll(criteria));
- }
-
- for (Project project: projects) {
- if (!SecurityUtils.canRead(project))
- throw new UnauthorizedException("Unauthorized access to project " + project.getName());
- }
- return projects;
+ public Project query(@QueryParam("name") String name) {
+ Project project = projectManager.find(name);
+ if (project != null && !SecurityUtils.canRead(project))
+ throw new UnauthorizedException("Unauthorized access to project " + project.getName());
+ return project;
}
}
diff --git a/rest/src/main/java/com/gitplex/server/rest/ReviewResource.java b/rest/src/main/java/com/gitplex/server/rest/ReviewResource.java
index bb923e9b90..ba04d29be7 100644
--- a/rest/src/main/java/com/gitplex/server/rest/ReviewResource.java
+++ b/rest/src/main/java/com/gitplex/server/rest/ReviewResource.java
@@ -15,10 +15,10 @@ import javax.ws.rs.core.MediaType;
import org.apache.shiro.authz.UnauthorizedException;
-import com.gitplex.server.manager.UserManager;
import com.gitplex.server.manager.ReviewManager;
-import com.gitplex.server.model.User;
+import com.gitplex.server.manager.UserManager;
import com.gitplex.server.model.Review;
+import com.gitplex.server.model.User;
import com.gitplex.server.security.SecurityUtils;
@Path("/reviews")
@@ -59,13 +59,23 @@ public class ReviewResource {
@POST
public Long save(@NotNull @Valid Review review) {
- if (!SecurityUtils.canWrite(review.getRequest().getTargetProject()))
+ User user = userManager.getCurrent();
+ if (!SecurityUtils.canRead(review.getRequest().getTargetProject()) || user == null)
throw new UnauthorizedException();
-
- review.setUser(userManager.getCurrent());
-
+
+ if (review.isNew()) {
+ Review existingReview = reviewManager.find(review.getRequest(), user, review.getCommit());
+ if (existingReview != null) {
+ existingReview.setApproved(review.isApproved());
+ existingReview.setAutoCheck(review.isAutoCheck());
+ existingReview.setCheckMerged(review.isCheckMerged());
+ existingReview.setNote(review.getNote());
+ reviewManager.save(existingReview);
+ return existingReview.getId();
+ }
+ }
+ review.setUser(user);
reviewManager.save(review);
-
return review.getId();
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarLink.java b/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarLink.java
index 2bafe2b4a0..1b0b3dff63 100644
--- a/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/avatar/AvatarLink.java
@@ -59,7 +59,7 @@ public class AvatarLink extends ViewStateAwarePageLink<Void> {
} else {
tooltip = null;
}
- url = avatarManager.getAvatarUrl(user.getFacade());
+ url = avatarManager.getAvatarUrl(user!=null?user.getFacade():null);
}
public AvatarLink(String id, PersonIdent person) {
diff --git a/web/src/main/java/com/gitplex/server/web/component/projectchoice/AbstractProjectChoice.java b/web/src/main/java/com/gitplex/server/web/component/projectchoice/AbstractProjectChoice.java
deleted file mode 100644
index 853ac86126..0000000000
--- a/web/src/main/java/com/gitplex/server/web/component/projectchoice/AbstractProjectChoice.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.gitplex.server.web.component.projectchoice;
-
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.model.IModel;
-
-import com.gitplex.server.util.facade.ProjectFacade;
-import com.gitplex.server.web.component.select2.Select2Choice;
-
-@SuppressWarnings("serial")
-public class AbstractProjectChoice extends Select2Choice<ProjectFacade> {
-
- public AbstractProjectChoice(String id, IModel<ProjectFacade> projectModel,
- AbstractProjectChoiceProvider choiceProvider) {
- super(id, projectModel, choiceProvider);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- getSettings().setPlaceholder("Choose a project...");
- getSettings().setFormatResult("gitplex.server.projectChoiceFormatter.formatResult");
- getSettings().setFormatSelection("gitplex.server.projectChoiceFormatter.formatSelection");
- getSettings().setEscapeMarkup("gitplex.server.projectChoiceFormatter.escapeMarkup");
- }
-
- @Override
- protected void onBeforeRender() {
- getSettings().setAllowClear(!isRequired());
- super.onBeforeRender();
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- response.render(JavaScriptHeaderItem.forReference(new ProjectChoiceResourceReference()));
- }
-
-}
diff --git a/web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupSingleChoiceEditor.java b/web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupSingleChoiceEditor.java
index 55a4a803e6..bc7a796e06 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupSingleChoiceEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/groupchoice/GroupSingleChoiceEditor.java
@@ -6,6 +6,7 @@ import org.apache.wicket.util.convert.ConversionException;
import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.GroupManager;
+import com.gitplex.server.model.Group;
import com.gitplex.server.util.facade.GroupFacade;
import com.gitplex.server.web.component.groupchoice.GroupChoiceProvider;
import com.gitplex.server.web.component.groupchoice.GroupSingleChoice;
@@ -27,13 +28,14 @@ public class GroupSingleChoiceEditor extends PropertyEditor<String> {
protected void onInitialize() {
super.onInitialize();
- GroupFacade group;
+ Group group;
if (getModelObject() != null)
- group = GitPlex.getInstance(GroupManager.class).find(getModelObject()).getFacade();
+ group = GitPlex.getInstance(GroupManager.class).find(getModelObject());
else
group = null;
- input = new GroupSingleChoice("input", Model.of(group), new GroupChoiceProvider());
+ GroupFacade facade = group!=null?group.getFacade():null;
+ input = new GroupSingleChoice("input", Model.of(facade), new GroupChoiceProvider());
input.setConvertEmptyInputStringToNull(true);
// add this to control allowClear flag of select2
diff --git a/web/src/main/java/com/gitplex/server/web/editable/userchoice/UserSingleChoiceEditor.java b/web/src/main/java/com/gitplex/server/web/editable/userchoice/UserSingleChoiceEditor.java
index 7a44f81259..a700776ebc 100644
--- a/web/src/main/java/com/gitplex/server/web/editable/userchoice/UserSingleChoiceEditor.java
+++ b/web/src/main/java/com/gitplex/server/web/editable/userchoice/UserSingleChoiceEditor.java
@@ -39,7 +39,8 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {
else
user = null;
- input = new UserSingleChoice("input", Model.of(user.getFacade()), new UserChoiceProvider(type));
+ UserFacade facade = user!=null?user.getFacade():null;
+ input = new UserSingleChoice("input", Model.of(facade), new UserChoiceProvider(type));
input.setConvertEmptyInputStringToNull(true);
// add this to control allowClear flag of select2