From b629b98ddcfa1937721e90206713bbc1912e0583 Mon Sep 17 00:00:00 2001
From: Suwon Chae <doortts@gmail.com>
Date: Sat, 4 Mar 2017 20:16:40 +0900
Subject: [PATCH] subtask: Make Subtak button & design

---
 app/assets/stylesheets/less/_page.less        | 19 ++++++++++
 app/assets/stylesheets/less/_responsive.less  |  6 ++-
 app/controllers/IssueApp.java                 |  9 +++++
 app/models/Issue.java                         |  4 ++
 app/views/issue/create.scala.html             | 37 ++++++-------------
 app/views/issue/edit.scala.html               | 10 ++++-
 .../issue/partial_select_subtask.scala.html   | 15 ++++----
 public/javascripts/common/yona.Subtask.js     | 10 +++++
 8 files changed, 74 insertions(+), 36 deletions(-)
 create mode 100644 public/javascripts/common/yona.Subtask.js

diff --git a/app/assets/stylesheets/less/_page.less b/app/assets/stylesheets/less/_page.less
index 4f179c7cb..3f7588384 100644
--- a/app/assets/stylesheets/less/_page.less
+++ b/app/assets/stylesheets/less/_page.less
@@ -6687,6 +6687,25 @@ div.diff-body[data-outdated="true"] tr:hover .icon-comment {
     color: #9e9e9e;
 }
 
+.subtask-message {
+    font-size: 12px;
+    color: #9E9E9E;
+    line-height: 15px;
+    padding: 7px 0 5px 0;
+    border: 1px solid #ddd;
+    text-align: center;
+    max-width: 80px;
+    &:hover {
+        color: @primary;
+        cursor:pointer;
+        border: 1px solid @primary;
+    }
+}
+
+.subtask-wrap {
+    display: none;
+}
+
 .infos, .parent-issue {
     .upload-progress {
         display: inline-block;
diff --git a/app/assets/stylesheets/less/_responsive.less b/app/assets/stylesheets/less/_responsive.less
index 60bee16ea..3475f92d8 100644
--- a/app/assets/stylesheets/less/_responsive.less
+++ b/app/assets/stylesheets/less/_responsive.less
@@ -434,6 +434,11 @@
             }
         }
     }
+
+    .subtask-message {
+        min-width: 50px;
+        margin-left: -40px;
+    }
 }
 
 @media all and (max-width:1199px){
@@ -536,7 +541,6 @@
     .project-header-outer {
         max-width: 1199px;
         min-width: 1000px;
-        padding:0 10px;
 
         .project-header-inner {
             .project-header-wrap {
diff --git a/app/controllers/IssueApp.java b/app/controllers/IssueApp.java
index e9967cf3e..b368cf0ae 100644
--- a/app/controllers/IssueApp.java
+++ b/app/controllers/IssueApp.java
@@ -410,6 +410,15 @@ public static Result newIssue(String ownerName, String projectName) {
         }
 
         final Issue newIssue = issueForm.get();
+        if(StringUtils.isNotEmpty(newIssue.targetProjectId)){
+            Project toAnotherProject = Project.find.byId(Long.valueOf(newIssue.targetProjectId));
+            if(toAnotherProject == null){
+                flash(Constants.WARNING, Messages.get("error.notfound.project"));
+                return badRequest(create.render("title.newIssue", new Form<>(Issue.class), project, null));
+            } else {
+                project = toAnotherProject;
+            }
+        }
         removeAnonymousAssignee(newIssue);
 
         if (newIssue.body == null) {
diff --git a/app/models/Issue.java b/app/models/Issue.java
index b26f0b600..91fc18377 100644
--- a/app/models/Issue.java
+++ b/app/models/Issue.java
@@ -28,6 +28,7 @@
 import org.apache.shiro.util.CollectionUtils;
 import play.data.Form;
 import play.data.format.Formats;
+import play.db.ebean.Model.Finder;
 import play.i18n.Messages;
 import utils.JodaDateUtil;
 
@@ -95,6 +96,9 @@ public Issue(Project project, User author, String title, String body) {
         this.state = State.OPEN;
     }
 
+    @Transient
+    public String targetProjectId;
+
     @Transient
     public String parentIssueId;
 
diff --git a/app/views/issue/create.scala.html b/app/views/issue/create.scala.html
index 0418cc4d0..de80e57cb 100644
--- a/app/views/issue/create.scala.html
+++ b/app/views/issue/create.scala.html
@@ -30,7 +30,12 @@
                 <dl>
                     <dd>
                     	@defining(issueForm.errors().get("title")) { errors =>
-                        <input type="text" id="title" name="title" placeholder="@Messages("title")" value="" class="text title zen-mode @if(errors != null) {error}" maxlength="250" tabindex="1">
+                            <div class="span12">
+                                <div class="span11">
+                                    <input type="text" id="title" name="title" value="" class="text title @if(errors != null) {error}" maxlength="250" tabindex="1" placeholder="@Messages("title")">
+                                </div>
+                                <div class="span1"><div><div class="subtask-message">Options</div></div></div>
+                            </div>
     	                    @if(errors != null) {
     							<div class="message">
     							@for(error <- errors) {
@@ -38,30 +43,11 @@
     							}
     							</div>
     						}
-                        <div class="subtitle-message">+ Sub task</div>
-                        <div class="subtask-wrap">
-                            <div class="span3">
-                                <select id="projects" name="targetProjectName" data-format="projects" data-placeholder="@Messages("organization.choose.projects")" data-toggle="select2" data-container-css-class="fullsize" >
-                                    <option value="@project.name" data-avatar-url="@urlToProjectLogo(project)">@project.name</option>
-                                @for(project <- UserApp.currentUser().myProjects("")) {
-                                    <option value="@project.name" data-avatar-url="@urlToProjectLogo(project)">@project.name</option>
-                                }
-                                </select>
-                            </div>
-                            <div class="span8">
-                                <select id="parentId" name="parentIssueId" data-format="issues" data-placeholder="@Messages("organization.choose.projects")" data-toggle="select2" data-container-css-class="fullsize" >
-                                    <option disabled selected value> -- select an issue -- </option>
-                                    @if(StringUtils.isNotEmpty(parentIssueId)){
-                                        @defining(Issue.finder.byId(Long.parseLong(parentIssueId))) { issue =>
-                                            <option value="@parentIssueId" selected>#@issue.getNumber. @issue.title</option>
-                                        }
-                                    }
-                                @for(issue <- Issue.findByProject(project, "", 1)) {
-                                    <option value="@issue.id" @if(issue.id+"" == parentIssueId){selected}>#@issue.getNumber. @issue.title</option>
-                                }
-                                </select>
-                            </div>
-                        </div>
+                            @if(StringUtils.isNotEmpty(parentIssueId)) {
+                                @partial_select_subtask(project, Long.parseLong(parentIssueId))
+                            } else {
+                                @partial_select_subtask(project, null)
+                            }
     					}
                     </dd>
                 </dl>
@@ -149,6 +135,7 @@
 <link rel="stylesheet" type="text/css" media="screen" href="@routes.Assets.at("javascripts/lib/atjs/jquery.atwho.css")">
 <script type="text/javascript" src="@routes.Assets.at("javascripts/lib/atjs/jquery.caret.min.js")"></script>
 <script type="text/javascript" src="@routes.Assets.at("javascripts/lib/atjs/jquery.atwho.js")"></script>
+<script type="text/javascript" src="@routes.Assets.at("javascripts/common/yona.Subtask.js")"></script>
 <script type="text/javascript">
     $(function(){
         // yobi.issue.Write
diff --git a/app/views/issue/edit.scala.html b/app/views/issue/edit.scala.html
index b39425eac..d25b0eca7 100644
--- a/app/views/issue/edit.scala.html
+++ b/app/views/issue/edit.scala.html
@@ -37,7 +37,12 @@
                     </dt>
                     <dd>
                     	@defining(issueForm.errors().get("title")) { errors =>
-                        <input type="text" id="title" name="title" value="@issue.title" class="zen-mode text title @if(errors != null) {error}" maxlength="250" tabindex="1" placeholder="@Messages("title.text")">
+                            <div class="span12">
+                                <div class="span11">
+                                    <input type="text" id="title" name="title" value="" class="text title @if(errors != null) {error}" maxlength="250" tabindex="1" placeholder="@Messages("title")">
+                                </div>
+                                <div class="span1 subtask-message">Options</div>
+                            </div>
     	                    @if(errors != null) {
     							<div class="message">
     							@for(error <- errors) {
@@ -45,7 +50,7 @@
     							}
     							</div>
     						}
-                          @partial_select_subtask(project, issue, parentIssueId)
+                          @partial_select_subtask(project, parentIssueId)
     					}
                     </dd>
                 </dl>
@@ -177,6 +182,7 @@
 <link rel="stylesheet" type="text/css" media="screen" href="@routes.Assets.at("javascripts/lib/atjs/jquery.atwho.css")">
 <script type="text/javascript" src="@routes.Assets.at("javascripts/lib/atjs/jquery.caret.min.js")"></script>
 <script type="text/javascript" src="@routes.Assets.at("javascripts/lib/atjs/jquery.atwho.js")"></script>
+<script type="text/javascript" src="@routes.Assets.at("javascripts/common/yona.Subtask.js")"></script>
 <script type="text/javascript">
     $(function(){
         // yobi.issue.Write
diff --git a/app/views/issue/partial_select_subtask.scala.html b/app/views/issue/partial_select_subtask.scala.html
index 0c9259484..26003c766 100644
--- a/app/views/issue/partial_select_subtask.scala.html
+++ b/app/views/issue/partial_select_subtask.scala.html
@@ -4,23 +4,22 @@
 * Copyright Yona & Yobi Authors & NAVER Corp.
 * https://yona.io
 **@
-@(project:Project, issue:Issue, parentIssueId:Long)
+@(project:Project, parentIssueId:Long)
 
 @import utils.TemplateHelper._
 
-<div class="subtitle-message">+ Sub task</div>
 <div class="subtask-wrap">
     <div class="span3">
-        <select id="projects" name="targetProjectName" data-format="projects" data-placeholder="@Messages("organization.choose.projects")" data-toggle="select2" data-container-css-class="fullsize" >
-            <option value="@project.name" data-avatar-url="@urlToProjectLogo(project)">@project.name</option>
+        <select id="targetProjectId" name="targetProjectId" data-format="projects" data-placeholder="@Messages("organization.choose.projects")" data-toggle="select2" data-container-css-class="fullsize" disabled>
+            <option value="@project.id" data-avatar-url="@urlToProjectLogo(project)">@project.name</option>
             @for(project <- UserApp.currentUser().myProjects("")) {
-                <option value="@project.name" data-avatar-url="@urlToProjectLogo(project)">@project.name</option>
+                <option value="@project.id" data-avatar-url="@urlToProjectLogo(project)">@project.name</option>
             }
         </select>
     </div>
-    <div class="span8">
-        <select id="parentId" name="parentIssueId" data-format="issues" data-placeholder="@Messages("organization.choose.projects")" data-toggle="select2" data-container-css-class="fullsize" >
-            <option value="" selected> -- select an issue -- </option>
+    <div class="span6">
+        <select id="parentId" name="parentIssueId" data-format="issues" data-placeholder="@Messages("organization.choose.projects")" data-toggle="select2" data-container-css-class="fullsize" disabled>
+            <option value="" selected> -- select a parent issue -- </option>
             @if(Option(parentIssueId).isDefined){
                 @defining(Issue.finder.byId(parentIssueId)) { issue =>
                     <option value="@issue.id" selected>#@issue.getNumber. @issue.title</option>
diff --git a/public/javascripts/common/yona.Subtask.js b/public/javascripts/common/yona.Subtask.js
new file mode 100644
index 000000000..cc36ba1b5
--- /dev/null
+++ b/public/javascripts/common/yona.Subtask.js
@@ -0,0 +1,10 @@
+$(function () {
+    $(".subtask-message").on("click", function () {
+        var subtaskWrap = $(".subtask-wrap");
+        subtaskWrap.toggle();
+        var subtaskInputFields = subtaskWrap.find("select");
+        subtaskInputFields.each(function(){
+            this.disabled = !this.disabled;
+        });
+    });
+});