Merge branch 'improve/issue-1824' of dlab/hive

from pull-request 1318 * refs/heads/improve/issue-1824: IssueLabel: don't close dropdown on select at create/edit issue form Reviewed-by: 이희구 <elf_hazard@nhn.com>
naver · Nov 6, 2014 · 1e991f3 · 1e991f3
2 parents 2ad3cd1 + b544cd6
commit 1e991f3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/app/views/issue/create.scala.html b/app/views/issue/create.scala.html
@@ -119,7 +119,7 @@
                         </dd>
                     </dl>
 
-                    @partial_select_label(IssueLabel.findByProject(project), null, "issue-option")
+                    @partial_select_label(IssueLabel.findByProject(project), null, "issue-option", "data-close-on-select=false")
                 </div>
             </div>
         </div>

diff --git a/app/views/issue/edit.scala.html b/app/views/issue/edit.scala.html
@@ -157,7 +157,7 @@
                         </dd>
                     </dl>
 
-                    @partial_select_label(IssueLabel.findByProject(project), issue.getLabelIds, "issue-option")
+                    @partial_select_label(IssueLabel.findByProject(project), issue.getLabelIds, "issue-option", "data-close-on-select=false")
                 </div>
             </div>
         </div>

diff --git a/app/views/issue/partial_select_label.scala.html b/app/views/issue/partial_select_label.scala.html
@@ -18,7 +18,8 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 **@
-@(labels:List[models.IssueLabel], selectedLabelIds:Set[Long] = null, wrapperCSSClassName:String = "")
+@(labels:List[models.IssueLabel], selectedLabelIds:Set[Long] = null,
+  wrapperCSSClassName:String = "", additionalAttr:String = "")
 
 @if(!labels.isEmpty){
 <dl class="@wrapperCSSClassName">
@@ -27,9 +28,9 @@
   </dt>
   <dd>
     <select name="labelIds" multiple="multiple" data-search="labelIds"
-            data-toggle="select2" data-format="issuelabel" data-allow-clear="true" data-close-on-select="true"
+            data-toggle="select2" data-format="issuelabel" data-allow-clear="true"
             data-dropdown-css-class="issue-labels" data-container-css-class="issue-labels bordered fullsize"
-            data-placeholder="@Messages("label.select")">
+            data-placeholder="@Messages("label.select")" @additionalAttr>
       <option></option>
       @labels.groupBy(_.category).map {
         case (category, labels) => {