Merge branch 'issuable-new-due-date' into 'master'

Issuable form due date

For some reason, this was never in the original merge request for due date?

![Screen_Shot_2016-04-22_at_21.49.44](/uploads/7d4e2b07f75a33009e3170fdb076a4bd/Screen_Shot_2016-04-22_at_21.49.44.png)

Closes #15516

See merge request !3895

app/assets/javascripts/issuable_form.js.coffee

@@ -20,6 +20,15 @@ class @IssuableForm
 
     @initWip()
 
+    $issuableDueDate = $('#issuable-due-date')
+
+    if $issuableDueDate.length
+      $('.datepicker').datepicker(
+        dateFormat: 'yy-mm-dd',
+        onSelect: (dateText, inst) ->
+          $issuableDueDate.val dateText
+      ).datepicker 'setDate', $.datepicker.parseDate('yy-mm-dd', $issuableDueDate.val())
+
   initAutosave: ->
     new Autosave @titleField, [
       document.location.pathname,

app/assets/stylesheets/framework/forms.scss

@@ -28,10 +28,6 @@ input[type='text'].danger {
 }
 
 label {
-  &.control-label {
-    @extend .col-sm-2;
-  }
-
   &.inline-label {
     margin: 0;
   }
@@ -41,6 +37,10 @@ label {
   }
 }
 
+.control-label {
+  @extend .col-sm-2;
+}
+
 .inline-input-group {
   width: 250px;
 }

app/views/shared/issuable/_form.html.haml

@@ -44,45 +44,53 @@
           This issue is confidential and should only be visible to team members
 
 - if can?(current_user, :"admin_#{issuable.to_ability_name}", issuable.project)
+  - has_due_date = issuable.has_attribute?(:due_date)
   %hr
-  .form-group
-    .issue-assignee
-      = f.label :assignee_id, "Assignee", class: 'control-label'
-      .col-sm-10
-        .issuable-form-select-holder
-          = users_select_tag("#{issuable.class.model_name.param_key}[assignee_id]",
-              placeholder: 'Select assignee', class: 'custom-form-control', null_user: true,
-              selected: issuable.assignee_id, project: @target_project || @project,
-              first_user: true, current_user: true, include_blank: true)
-         
-        = link_to 'Assign to me', '#', class: 'btn assign-to-me-link'
-  .form-group
-    .issue-milestone
-      = f.label :milestone_id, "Milestone", class: 'control-label'
-      .col-sm-10
-        - if milestone_options(issuable).present?
+  .row
+    %div{ class: (has_due_date ? "col-lg-6" : "col-sm-12") }
+      .form-group.issue-assignee
+        = f.label :assignee_id, "Assignee", class: "control-label #{"col-lg-4" if has_due_date}"
+        .col-sm-10{ class: ("col-lg-8" if has_due_date) }
           .issuable-form-select-holder
-            = f.select(:milestone_id, milestone_options(issuable),
-              { include_blank: true }, { class: 'select2', data: { placeholder: 'Select milestone' } })
-        - else
-          .prepend-top-10
-          %span.light No open milestones available.
-         
-        - if can? current_user, :admin_milestone, issuable.project
-          = link_to 'Create new milestone', new_namespace_project_milestone_path(issuable.project.namespace, issuable.project), target: :blank
-  .form-group
-    - has_labels = issuable.project.labels.any?
-    = f.label :label_ids, "Labels", class: 'control-label'
-    .col-sm-10{ class: ('issuable-form-padding-top' if !has_labels) }
-      - if has_labels
-        .issuable-form-select-holder
-          = f.collection_select :label_ids, issuable.project.labels.all, :id, :name,
-            { selected: issuable.label_ids }, multiple: true, class: 'select2', data: { placeholder: "Select labels" }
-      - else
-        %span.light No labels yet.
-       
-      - if can? current_user, :admin_label, issuable.project
-        = link_to 'Create new label', new_namespace_project_label_path(issuable.project.namespace, issuable.project), target: :blank
+            = users_select_tag("#{issuable.class.model_name.param_key}[assignee_id]",
+                placeholder: 'Select assignee', class: 'custom-form-control', null_user: true,
+                selected: issuable.assignee_id, project: @target_project || @project,
+                first_user: true, current_user: true, include_blank: true)
+          %div
+            = link_to 'Assign to me', '#', class: 'assign-to-me-link prepend-top-5 inline'
+      .form-group.issue-milestone
+        = f.label :milestone_id, "Milestone", class: "control-label #{"col-lg-4" if has_due_date}"
+        .col-sm-10{ class: ("col-lg-8" if has_due_date) }
+          - if milestone_options(issuable).present?
+            .issuable-form-select-holder
+              = f.select(:milestone_id, milestone_options(issuable),
+                { include_blank: true }, { class: 'select2', data: { placeholder: 'Select milestone' } })
+          - else
+            .prepend-top-10
+            %span.light No open milestones available.
+          - if can? current_user, :admin_milestone, issuable.project
+            %div
+              = link_to 'Create new milestone', new_namespace_project_milestone_path(issuable.project.namespace, issuable.project), target: :blank, class: "prepend-top-5 inline"
+      .form-group
+        - has_labels = issuable.project.labels.any?
+        = f.label :label_ids, "Labels", class: "control-label #{"col-lg-4" if has_due_date}"
+        .col-sm-10{ class: "#{"col-lg-8" if has_due_date} #{'issuable-form-padding-top' if !has_labels}" }
+          - if has_labels
+            .issuable-form-select-holder
+              = f.collection_select :label_ids, issuable.project.labels.all, :id, :name,
+                { selected: issuable.label_ids }, multiple: true, class: 'select2', data: { placeholder: "Select labels" }
+          - else
+            %span.light No labels yet.
+          - if can? current_user, :admin_label, issuable.project
+            %div
+              = link_to 'Create new label', new_namespace_project_label_path(issuable.project.namespace, issuable.project), target: :blank, class: "prepend-top-5 inline"
+    - if has_due_date
+      .col-lg-6
+        .form-group
+          = f.label :due_date, "Due date", class: "control-label"
+          = f.hidden_field :due_date, id: "issuable-due-date"
+          .col-sm-10
+            .datepicker
 
 - if issuable.can_move?(current_user)
   %hr

spec/features/issues_spec.rb

@@ -64,6 +64,64 @@ describe 'Issues', feature: true do
     end
   end
 
+  describe 'due date', js: true do
+    context 'on new form' do
+      before do
+        visit new_namespace_project_issue_path(project.namespace, project)
+      end
+
+      it 'should save with due date' do
+        date = Date.today.at_beginning_of_month
+
+        fill_in 'issue_title', with: 'bug 345'
+        fill_in 'issue_description', with: 'bug description'
+
+        page.within '.datepicker' do
+          click_link date.day
+        end
+
+        expect(find('#issuable-due-date', visible: false).value).to eq date.to_s
+
+        click_button 'Submit issue'
+
+        page.within '.issuable-sidebar' do
+          expect(page).to have_content date.to_s(:medium)
+        end
+      end
+    end
+
+    context 'on edit form' do
+      let(:issue) { create(:issue, author: @user,project: project, due_date: Date.today.at_beginning_of_month.to_s) }
+
+      before do
+        visit edit_namespace_project_issue_path(project.namespace, project, issue)
+      end
+
+      it 'should save with due date' do
+        date = Date.today.at_beginning_of_month
+
+        expect(find('#issuable-due-date', visible: false).value).to eq date.to_s
+
+        date = date.tomorrow
+
+        fill_in 'issue_title', with: 'bug 345'
+        fill_in 'issue_description', with: 'bug description'
+
+        page.within '.datepicker' do
+          click_link date.day
+        end
+
+        expect(find('#issuable-due-date', visible: false).value).to eq date.to_s
+
+        click_button 'Save changes'
+
+        page.within '.issuable-sidebar' do
+          expect(page).to have_content date.to_s(:medium)
+        end
+      end
+    end
+  end
+
   describe 'Issue info' do
     it 'excludes award_emoji from comment count' do
       issue = create(:issue, author: @user, assignee: @user, project: project, title: 'foobar')
@@ -331,7 +389,7 @@ describe 'Issues', feature: true do
         page.within '.assignee' do
           click_link 'Edit'
         end
-        
+
         page.within '.dropdown-menu-user' do
           click_link @user.name
         end