issue: Remove milestone when moving issues

See: Yona Github issue #188
yona-projects · Mar 23, 2017 · a76238f · a76238f
1 parent 36d330f
commit a76238f
Showing 1 changed file with 19 additions and 11 deletions.
diff --git a/app/controllers/IssueApp.java b/app/controllers/IssueApp.java
@@ -407,7 +407,7 @@ public static Result newIssue(String ownerName, String projectName) {
         }
 
         final Issue newIssue = issueForm.get();
-        if(StringUtils.isNotEmpty(newIssue.targetProjectId)){
+        if(hasTargetProject(newIssue)){
             Project toAnotherProject = Project.find.byId(Long.valueOf(newIssue.targetProjectId));
             if(toAnotherProject == null){
                 flash(Constants.WARNING, Messages.get("error.notfound.project"));
@@ -549,20 +549,25 @@ public static Result editIssue(String ownerName, String projectName, Long number
         issue.dueDate = JodaDateUtil.lastSecondOfDay(issue.dueDate);
 
         Issue originalIssue = Issue.findByNumber(project, number);
-        if(StringUtils.isNotEmpty(issue.targetProjectId)){
+        if(hasTargetProject(issue)) {
             Project toOtherProject = Project.find.byId(Long.valueOf(issue.targetProjectId));
-            if(toOtherProject == null){
+            if (toOtherProject == null) {
                 flash(Constants.WARNING, Messages.get("error.notfound.project"));
                 return badRequest(edit.render("error.validation", issueForm, Issue.findByNumber(project, number), project));
-            } else if (isRequestedToOtherProject(project, toOtherProject)) {
-                if (!AccessControl.isProjectResourceCreatable(
-                        UserApp.currentUser(), toOtherProject, ResourceType.ISSUE_POST)) {
-                    return forbidden(ErrorViews.Forbidden.render("error.forbidden", toOtherProject));
-                }
+            }
+
+            if (!AccessControl.isProjectResourceCreatable(
+                    UserApp.currentUser(), toOtherProject, ResourceType.ISSUE_POST)) {
+                return forbidden(ErrorViews.Forbidden.render("error.forbidden", toOtherProject));
+            }
+
+            if (isRequestedToOtherProject(project, toOtherProject)) {
                 moveIssueToOtherProject(originalIssue, toOtherProject);
+                issue.milestone = null;
+            } else {
+                updateSubtaskRelation(issue, originalIssue);
             }
         }
-        updateSubtaskRelation(issue, originalIssue);
 
         Call redirectTo = routes.IssueApp.issue(originalIssue.project.owner, originalIssue.project.name, originalIssue.getNumber());
 
@@ -599,6 +604,10 @@ public void run() {
         return editPosting(originalIssue, issue, issueForm, redirectTo, preUpdateHook);
     }
 
+    private static boolean hasTargetProject(Issue issue) {
+        return StringUtils.isNotEmpty(issue.targetProjectId);
+    }
+
     private static boolean isFromMyOwnPrivateProject(Project previous) {
         return previous.isPrivate() && previous.owner.equalsIgnoreCase(UserApp.currentUser().loginId);
     }
@@ -617,8 +626,8 @@ private static void moveIssueToOtherProject(Issue originalIssue, Project toOther
             transferLabels(originalIssue, toOtherProject);
         } else {
             originalIssue.labels = new HashSet<>();
-            originalIssue.update();
         }
+        originalIssue.update();
     }
 
     private static void transferLabels(Issue originalIssue, Project toProject) {
@@ -641,7 +650,6 @@ private static void transferLabels(Issue originalIssue, Project toProject) {
         }
 
         originalIssue.labels = new HashSet<>(newLabels);
-        originalIssue.update();
     }
 
     private static boolean isRequestedToOtherProject(Project project, Project toOtherProject) {