Reduce duplication between the project and group label forms

7 files changed, 6 insertions, 38 deletions

diff --git a/app/controllers/groups/labels_controller.rb b/app/controllers/groups/labels_controller.rb
index 0ebdee55c79..483a5aedf12 100644
--- a/app/controllers/groups/labels_controller.rb
+++ b/app/controllers/groups/labels_controller.rb
@@ -21,6 +21,7 @@ class Groups::LabelsController < Groups::ApplicationController
 
   def new
     @label = @group.labels.new
+    @previous_labels_path = previous_labels_path
   end
 
   def create
diff --git a/app/views/groups/labels/_form.html.haml b/app/views/groups/labels/_form.html.haml
deleted file mode 100644
index a0b44b0dcfb..00000000000
--- a/app/views/groups/labels/_form.html.haml
+++ /dev/null
@@ -1,33 +0,0 @@
-= form_for @label, as: :label, url: url, html: { class: 'form-horizontal label-form js-quick-submit js-requires-input' } do |f|
-  = form_errors(@label)
-
-  .form-group
-    = f.label :title, class: 'control-label'
-    .col-sm-10
-      = f.text_field :title, class: "form-control", required: true, autofocus: true
-  .form-group
-    = f.label :description, class: 'control-label'
-    .col-sm-10
-      = f.text_field :description, class: "form-control js-quick-submit"
-  .form-group
-    = f.label :color, "Background color", class: 'control-label'
-    .col-sm-10
-      .input-group
-        .input-group-addon.label-color-preview &nbsp;
-        = f.color_field :color, class: "form-control"
-      .help-block
-        Choose any color.
-        %br
-        Or you can choose one of suggested colors below
-
-      .suggest-colors
-        - suggested_colors.each do |color|
-          = link_to '#', style: "background-color: #{color}", data: { color: color } do
-            &nbsp;
-
-  .form-actions
-    - if @label.persisted?
-      = f.submit 'Save changes', class: 'btn btn-save js-save-button'
-    - else
-      = f.submit 'Create Label', class: 'btn btn-create js-save-button'
-    = link_to 'Cancel', @previous_labels_path, class: 'btn btn-cancel'
diff --git a/app/views/groups/labels/edit.html.haml b/app/views/groups/labels/edit.html.haml
index 28471f407ad..836981fc6fd 100644
--- a/app/views/groups/labels/edit.html.haml
+++ b/app/views/groups/labels/edit.html.haml
@@ -4,4 +4,4 @@
   Edit Label
 %hr
 
-= render 'form', url: group_label_path(@group, @label)
+= render 'shared/labels/form', url: group_label_path(@group, @label), back_path: @previous_labels_path
diff --git a/app/views/groups/labels/new.html.haml b/app/views/groups/labels/new.html.haml
index 257ae97de03..2be87460b1d 100644
--- a/app/views/groups/labels/new.html.haml
+++ b/app/views/groups/labels/new.html.haml
@@ -5,4 +5,4 @@
   New Label
 %hr
 
-= render 'form', url: group_labels_path
+= render 'shared/labels/form', url: group_labels_path, back_path: @previous_labels_path
diff --git a/app/views/projects/labels/edit.html.haml b/app/views/projects/labels/edit.html.haml
index 49adb593559..a80a07b52e6 100644
--- a/app/views/projects/labels/edit.html.haml
+++ b/app/views/projects/labels/edit.html.haml
@@ -6,4 +6,4 @@
   %h3.page-title
     Edit Label
   %hr
-  = render 'form', url: namespace_project_label_path(@project.namespace.becomes(Namespace), @project, @label)
+  = render 'shared/labels/form', url: namespace_project_label_path(@project.namespace.becomes(Namespace), @project, @label), back_path: namespace_project_labels_path(@project.namespace, @project)
diff --git a/app/views/projects/labels/new.html.haml b/app/views/projects/labels/new.html.haml
index 0c177feb43c..f0d9be744d1 100644
--- a/app/views/projects/labels/new.html.haml
+++ b/app/views/projects/labels/new.html.haml
@@ -6,4 +6,4 @@
   %h3.page-title
     New Label
   %hr
-  = render 'form', url: namespace_project_labels_path(@project.namespace.becomes(Namespace), @project)
+  = render 'shared/labels/form', url: namespace_project_labels_path(@project.namespace.becomes(Namespace), @project), back_path: namespace_project_labels_path(@project.namespace, @project)
diff --git a/app/views/projects/labels/_form.html.haml b/app/views/shared/labels/_form.html.haml
index 28a062c7eb5..647e05e5ff7 100644
--- a/app/views/projects/labels/_form.html.haml
+++ b/app/views/shared/labels/_form.html.haml
@@ -30,4 +30,4 @@
       = f.submit 'Save changes', class: 'btn btn-save js-save-button'
     - else
       = f.submit 'Create Label', class: 'btn btn-create js-save-button'
-    = link_to 'Cancel', namespace_project_labels_path(@project.namespace, @project), class: 'btn btn-cancel'
+    = link_to 'Cancel', back_path, class: 'btn btn-cancel'