navbar: Change new issue button action of nav bar

yona-projects · Sep 24, 2017 · b01db32 · b01db32
1 parent 8255749
commit b01db32
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/app/controllers/IssueApp.java b/app/controllers/IssueApp.java
@@ -15,6 +15,7 @@
 import jxl.write.WriteException;
 import models.*;
 import models.enumeration.Operation;
+import models.enumeration.ProjectScope;
 import models.enumeration.ResourceType;
 import models.enumeration.State;
 import org.apache.commons.collections.CollectionUtils;
@@ -293,12 +294,8 @@ public static Result newDirectIssueForm() {
         User current = UserApp.currentUser();
 
         Project project = null;
-        // Fallback #1: Favorite projects 1st if exists
-        if(!CollectionUtils.isEmpty(current.favoriteProjects)) {
-            project = current.favoriteProjects.get(current.favoriteProjects.size() - 1).project;
-        }
 
-        // Fallback #2: Last visited project
+        // Fallback #1: Last visited project
         List<Project> visitedProjects = current.getVisitedProjects();
         if (project == null && !CollectionUtils.isEmpty(visitedProjects)) {
             project = visitedProjects.get(0);
@@ -321,10 +318,18 @@ public static Result newDirectMyIssueForm() {
             project = Project.findByOwnerAndProjectName(current.loginId, "_private");
         }
 
-        // Fallback to any other project
+        // Fallback to my project which is private and recently created
+        if (project == null) {
+            List<Project> projects = Project.findProjectsCreatedByUserAndScope(current.loginId, ProjectScope.PRIVATE, "createdDate desc");
+            if (!CollectionUtils.isEmpty(projects)) {
+                project = projects.get(0);
+            }
+        }
+
+        // Fallback to my public project
         if( project == null ) {
-            List<Project> projects = Project.findProjectsByMember(current.id);
-            if(!CollectionUtils.isEmpty(projects)) {
+            List<Project> projects = Project.findProjectsCreatedByUserAndScope(current.loginId, ProjectScope.PUBLIC, "createdDate desc");
+            if (!CollectionUtils.isEmpty(projects)) {
                 project = projects.get(0);
             }
         }

diff --git a/app/models/Project.java b/app/models/Project.java
@@ -288,6 +288,12 @@ public static List<Project> findProjectsCreatedByUser(String loginId, String ord
 
     }
 
+    public static List<Project> findProjectsCreatedByUserAndScope(String loginId, ProjectScope projectScope, String orderString) {
+        return find.where().eq("owner", loginId)
+                .eq("projectScope", projectScope)
+                .orderBy(orderString).findList();
+    }
+
     public Date lastUpdateDate() {
         try {
             PlayRepository repository = RepositoryService.getRepository(this);

diff --git a/conf/messages b/conf/messages
@@ -291,7 +291,7 @@ issue.list.authoredByMe = Created
 issue.list.commentedByMe = Commented
 issue.list.mentionedOfMe = Mentioned
 issue.menu.new = New issue
-issue.menu.new.mine = New issue - personal
+issue.menu.new.mine = New issue - personal inbox
 issue.myIssue = My issues
 issue.new.result = Results
 issue.noAssignee = No assignee

diff --git a/conf/messages.ko-KR b/conf/messages.ko-KR
@@ -291,7 +291,7 @@ issue.list.authoredByMe = 작성한 이슈
 issue.list.commentedByMe = 댓글 남긴 이슈
 issue.list.mentionedOfMe = 나를 언급한 이슈
 issue.menu.new = 새 이슈
-issue.menu.new.mine = 새 이슈 - 개인
+issue.menu.new.mine = 새 이슈 - 개인 inbox
 issue.myIssue = 내 이슈
 issue.new.result = 확인결과
 issue.noAssignee = 담당자 없음