Allow set labels from Issue/MR forms

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

5 files changed, 17 insertions, 73 deletions

diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 4dc9384c996..bde90466ea1 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -152,7 +152,7 @@ class Projects::IssuesController < Projects::ApplicationController
   def issue_params
     params.require(:issue).permit(
       :title, :assignee_id, :position, :description,
-      :milestone_id, :label_list, :state_event
+      :milestone_id, :state_event, label_ids: []
     )
   end
 end
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 3f0833303ab..8dca0400693 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -242,7 +242,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     params.require(:merge_request).permit(
       :title, :assignee_id, :source_project_id, :source_branch,
       :target_project_id, :target_branch, :milestone_id,
-      :state_event, :description, :label_list
+      :state_event, :description, label_ids: []
     )
   end
 end
diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml
index d29a7973100..a2a867cc0b9 100644
--- a/app/views/projects/issues/_form.html.haml
+++ b/app/views/projects/issues/_form.html.haml
@@ -44,14 +44,11 @@
         .col-sm-10= f.select(:milestone_id, milestone_options(@issue), { include_blank: "Select milestone" }, {class: 'select2'})
 
     .form-group
-      = f.label :label_list, class: 'control-label' do
+      = f.label :label_ids, class: 'control-label' do
         %i.icon-tag
         Labels
       .col-sm-10
-        = f.text_field :label_list, maxlength: 2000, class: "form-control"
-        %p.hint Separate labels with commas.
-
-
+        = f.collection_select :label_ids, @project.labels.all, :id, :name, { selected: @issue.label_ids }, multiple: true, class: 'select2'
 
     .form-actions
       - if @issue.new_record?
@@ -63,35 +60,6 @@
       = link_to "Cancel", cancel_path, class: 'btn btn-cancel'
 
 :javascript
-  $("#issue_label_list")
-    .bind( "keydown", function( event ) {
-      if ( event.keyCode === $.ui.keyCode.TAB &&
-        $( this ).data( "autocomplete" ).menu.active ) {
-        event.preventDefault();
-      }
-    })
-    .bind("click", function(event) {
-      $(this).autocomplete("search", "");
-    })
-    .autocomplete({
-      minLength: 0,
-      source: function( request, response ) {
-        response( $.ui.autocomplete.filter(
-          #{raw labels_autocomplete_source}, extractLast( request.term ) ) );
-      },
-      focus: function() {
-        return false;
-      },
-      select: function(event, ui) {
-        var terms = split( this.value );
-        terms.pop();
-        terms.push( ui.item.value );
-        terms.push( "" );
-        this.value = terms.join( ", " );
-        return false;
-      }
-    });
-
   $('.assign-to-me-link').on('click', function(e){
     $('#issue_assignee_id').val("#{current_user.id}").trigger("change");
     e.preventDefault();
diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml
index 9ef232b5268..0af89b6e376 100644
--- a/app/views/projects/merge_requests/_form.html.haml
+++ b/app/views/projects/merge_requests/_form.html.haml
@@ -46,14 +46,12 @@
         .col-sm-10= f.select(:milestone_id, milestone_options(@merge_request), { include_blank: "Select milestone" }, {class: 'select2'})
 
 
-    - if @merge_request.persisted? # Only allow labels on edit to avoid fork vs upstream repo labels issue
-      .form-group
-        = f.label :label_list, class: 'control-label' do
-          %i.icon-tag
-          Labels
-        .col-sm-10
-          = f.text_field :label_list, maxlength: 2000, class: "form-control"
-          %p.hint Separate labels with commas.
+    .form-group
+      = f.label :label_ids, class: 'control-label' do
+        %i.icon-tag
+        Labels
+      .col-sm-10
+        = f.collection_select :label_ids, @merge_request.target_project.labels.all, :id, :name, { selected: @merge_request.label_ids }, multiple: true, class: 'select2'
 
   .form-actions
     - if @merge_request.new_record?
@@ -74,33 +72,4 @@
     e.preventDefault();
   });
 
-  $("#merge_request_label_list")
-    .bind( "keydown", function( event ) {
-      if ( event.keyCode === $.ui.keyCode.TAB &&
-        $( this ).data( "autocomplete" ).menu.active ) {
-        event.preventDefault();
-      }
-    })
-    .bind("click", function(event) {
-      $(this).autocomplete("search", "");
-    })
-    .autocomplete({
-      minLength: 0,
-      source: function( request, response ) {
-        response( $.ui.autocomplete.filter(
-          #{raw labels_autocomplete_source}, extractLast( request.term ) ) );
-      },
-      focus: function() {
-        return false;
-      },
-      select: function(event, ui) {
-        var terms = split( this.value );
-        terms.pop();
-        terms.push( ui.item.value );
-        terms.push( "" );
-        this.value = terms.join( ", " );
-        return false;
-      }
-    });
-
   window.project_image_path_upload = "#{upload_image_project_path @project}";
diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml
index 73d364b4f93..25651d37589 100644
--- a/app/views/projects/merge_requests/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/_new_submit.html.haml
@@ -43,6 +43,13 @@
             %i.icon-time
             Milestone
           %div= f.select(:milestone_id, milestone_options(@merge_request), { include_blank: "Select milestone" }, {class: 'select2'})
+      .form-group
+        = f.label :label_ids do
+          %i.icon-tag
+          Labels
+        %div
+          = f.collection_select :label_ids, @merge_request.target_project.labels.all, :id, :name, { selected: @merge_request.label_ids }, multiple: true, class: 'select2'
+
     .panel-footer
       - if contribution_guide_url(@target_project)
         %p