From 430b0b7a812a361bc02a35d8ce4b5fddc2f6bc6d 2015-12-12 12:21:43
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: 2015-12-12 12:21:43
Subject: [PATCH] Don't set default due date in the past (#21488).

git-svn-id: http://svn.redmine.org/redmine/trunk@14969 e93f8b46-1217-0410-a6f0-8f06a7374b81

---

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 3a27039..9c6c7a4 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -561,7 +561,13 @@ function beforeShowDatePicker(input, inst) {
       break;
     case "issue_due_date" :
       if ($("#issue_start_date").size() > 0) {
-        default_date = $("#issue_start_date").val();
+        var start_date = $("#issue_start_date").val();
+        if (start_date != "") {
+          start_date = new Date(Date.parse(start_date));
+          if (start_date > new Date()) {
+            default_date = $("#issue_start_date").val();
+          }
+        }
       }
       break;
   }
diff --git a/test/ui/issues_test_ui.rb b/test/ui/issues_test_ui.rb
index 8264326..be44357 100644
--- a/test/ui/issues_test_ui.rb
+++ b/test/ui/issues_test_ui.rb
@@ -150,15 +150,30 @@ class Redmine::UiTest::IssuesTest < Redmine::UiTest::Base
     end
   end
 
-  def test_create_issue_start_due_date_default
+  def test_default_due_date_proposed_in_date_picker
     log_user('jsmith', 'jsmith')
     visit '/projects/ecookbook/issues/new'
+
+    # Future start date: due date should default to start date
+    fill_in 'Start date', :with => '2027-04-01'
+    fill_in 'Due date', :with => ''
+    page.first('p#due_date_area img').click
+    page.first("td.ui-datepicker-days-cell-over a").click
+    assert_equal '2027-04-01', page.find('input#issue_due_date').value
+
+    # Passed start date: due date should default to today
     fill_in 'Start date', :with => '2012-04-01'
     fill_in 'Due date', :with => ''
     page.first('p#due_date_area img').click
     page.first("td.ui-datepicker-days-cell-over a").click
-    assert_equal '2012-04-01', page.find('input#issue_due_date').value
+    assert_equal Date.today.to_s, page.find('input#issue_due_date').value
+  end
+
+  def test_default_start_date_proposed_in_date_picker
+    log_user('jsmith', 'jsmith')
+    visit '/projects/ecookbook/issues/new'
 
+    # Passed due date: start date should default to due date
     fill_in 'Start date', :with => ''
     fill_in 'Due date', :with => '2012-04-01'
     page.first('p#start_date_area img').click