Indefero Commit Details

Date:

2012-04-10 06:17:22 (13 years 6 months ago)

Author:

Simon Holywell

Branch:

develop

Commit:

1690fa8416af30191dd32556d18bdd7cba5b35b0

Parents:

9168a26a72960842369b5781acd533118869683f

Message:

Move the default due date time to be configurable in the IDF config file

Changes:

File differences

-475
476 476
477 477
478 
478
479
479 480
480 481
481 482
... ...
713 714
714 715
715 716
716 
717
718
717 719
718 720
719 721
+                                    'page_title' => $title,␊
                                    'preview' => $preview,␊
                                    'issue' => new IDF_Issue(),␊
                                    'date_today' => date('Y-m-d 23:59')␊
                                    'date_today' => date('Y-m-d'),␊
                                    'default_time' => Pluf::f('issue_default_due_date_time'),␊
                                    ),␊
                              self::autoCompleteArrays($prj)␊
                              );␊

                                                     'previous_issue_id' => $previous_issue_id,␊
                                                     'next_issue_id' => $next_issue_id,␊
                                                     'related_issues' => $related_issues,␊
                                                     'date_today' => date('Y-m-d 23:59'),␊
                                                     'date_today' => date('Y-m-d'),␊
                                                     'default_time' => Pluf::f('issue_default_due_date_time'),␊
                                                     ),␊
                                               $arrays),␊
                                               $request);␊
 ...
                                     'page_title' => $title,␊
                                     'preview' => $preview,␊
                                     'issue' => new IDF_Issue(),␊
-                                    'date_today' => date('Y-m-d 23:59')␊
+                                    'date_today' => date('Y-m-d'),␊
+                                    'default_time' => Pluf::f('issue_default_due_date_time'),␊
                                     ),␊
                               self::autoCompleteArrays($prj)␊
                               );␊
                                                      'previous_issue_id' => $previous_issue_id,␊
                                                      'next_issue_id' => $next_issue_id,␊
                                                      'related_issues' => $related_issues,␊
-                                                     'date_today' => date('Y-m-d 23:59'),␊
+                                                     'date_today' => date('Y-m-d'),␊
+                                                     'default_time' => Pluf::f('issue_default_due_date_time'),␊
                                                      ),␊
                                                $arrays),␊
                                                $request);␊

-544
545 545
546 546
547
548
549
550
547 551
548 552
+# high enough to show a proper activity index for those projects as well.␊
$cfg['activity_lookback'] = 7;␊
␊
# Configure the default time that should be used when setting an issue due date␊
# via the quick (COB, EOW, etc) menu or via the date picker␊
$cfg['issue_default_due_date_time'] = '17:30';␊
␊
return $cfg;␊
␊
 # high enough to show a proper activity index for those projects as well.␊
 $cfg['activity_lookback'] = 7;␊
 ␊
+# Configure the default time that should be used when setting an issue due date␊
+# via the quick (COB, EOW, etc) menu or via the date picker␊
+$cfg['issue_default_due_date_time'] = '17:30';␊
+␊
 return $cfg;␊
 ␊

-66
67 67
68 68
69 
69
70 70
71 71
72 72
... ...
112 112
113 113
114 114
115
115 116
116 117
117 118
... ...
121 122
122 123
123 124
124 
125
125 126
126 127
127 128
+<th>{$form.f.due_dtime.labelTag}:</th>␊
<td>{if $form.f.due_dtime.errors}{$form.f.due_dtime.fieldErrors}{/if}␊
{$form.f.due_dtime|unsafe}␊
<a href="#" rel="{$date_today}" id="due_dtime_today">Today</a>␊
<a href="#" rel="{$date_today} {$default_time}" id="due_dtime_today">Today</a>␊
</td>␊
<tr>␊
<th>{$form.f.relation_type0.labelTag}:</th>␊

{/block}␊
{block javascript}␊
<script type="text/javascript">␊
var default_time = '{$default_time}';␊
document.getElementById('id_summary').focus();{literal}␊
$(document).ready(function(){␊
    $("#id_due_dtime").datepicker({␊

        constrainInput: false,␊
        dateFormat: 'yy-mm-dd',␊
        onSelect: function(dateText, inst) {␊
            this.value = dateText + ' 23:59';␊
            this.value = dateText + ' ' + default_time;␊
        }␊
    });␊
    $("#due_dtime_today").click(function(){␊
 ...
 ...
 <th>{$form.f.due_dtime.labelTag}:</th>␊
 <td>{if $form.f.due_dtime.errors}{$form.f.due_dtime.fieldErrors}{/if}␊
 {$form.f.due_dtime|unsafe}␊
-<a href="#" rel="{$date_today}" id="due_dtime_today">Today</a>␊
+<a href="#" rel="{$date_today} {$default_time}" id="due_dtime_today">Today</a>␊
 </td>␊
 <tr>␊
 <th>{$form.f.relation_type0.labelTag}:</th>␊
 {/block}␊
 {block javascript}␊
 <script type="text/javascript">␊
+var default_time = '{$default_time}';␊
 document.getElementById('id_summary').focus();{literal}␊
 $(document).ready(function(){␊
     $("#id_due_dtime").datepicker({␊
         constrainInput: false,␊
         dateFormat: 'yy-mm-dd',␊
         onSelect: function(dateText, inst) {␊
-            this.value = dateText + ' 23:59';␊
+            this.value = dateText + ' ' + default_time;␊
         }␊
     });␊
     $("#due_dtime_today").click(function(){␊

-131
132 132
133 133
134 
134
135 135
136 136
137 137
... ...
213 213
214 214
215 215
216
216 217
217 218
218 219
... ...
222 223
223 224
224 225
225 
226
226 227
227 228
228 229
+<th>{$form.f.due_dtime.labelTag}:</th>␊
<td>{if $form.f.due_dtime.errors}{$form.f.due_dtime.fieldErrors}{/if}␊
{$form.f.due_dtime|unsafe}␊
<a href="#" rel="{$date_today}" id="due_dtime_today">Today</a>␊
<a href="#" rel="{$date_today} {$default_time}" id="due_dtime_today">Today</a>␊
</td>␊
<tr>␊
<tr>␊

{/block}␊
{block javascript}{if $form}{include 'idf/issues/js-autocomplete.html'}␊
<script type="text/javascript">␊
var default_time = '{$default_time}';␊
{literal}␊
$(document).ready(function(){␊
    $("#id_due_dtime").datepicker({␊

        constrainInput: false,␊
        dateFormat: 'yy-mm-dd',␊
        onSelect: function(dateText, inst) {␊
            this.value = dateText + ' 23:59';␊
            this.value = dateText + ' ' + default_time;␊
        }␊
    });␊
    $("#due_dtime_today").click(function(){␊
 ...
 ...
 <th>{$form.f.due_dtime.labelTag}:</th>␊
 <td>{if $form.f.due_dtime.errors}{$form.f.due_dtime.fieldErrors}{/if}␊
 {$form.f.due_dtime|unsafe}␊
-<a href="#" rel="{$date_today}" id="due_dtime_today">Today</a>␊
+<a href="#" rel="{$date_today} {$default_time}" id="due_dtime_today">Today</a>␊
 </td>␊
 <tr>␊
 <tr>␊
 {/block}␊
 {block javascript}{if $form}{include 'idf/issues/js-autocomplete.html'}␊
 <script type="text/javascript">␊
+var default_time = '{$default_time}';␊
 {literal}␊
 $(document).ready(function(){␊
     $("#id_due_dtime").datepicker({␊
         constrainInput: false,␊
         dateFormat: 'yy-mm-dd',␊
         onSelect: function(dateText, inst) {␊
-            this.value = dateText + ' 23:59';␊
+            this.value = dateText + ' ' + default_time;␊
         }␊
     });␊
     $("#due_dtime_today").click(function(){␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags