Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-22 08:46:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixes #404. "Create a new deferred todo in the tickler go to due field. The calendar is shown go to the 'show from' field. The calendar is not shown" The problem was a javascript error from the partially disabled keyboard shortcuts in the calendar. They are now totally disabled until we work out the Chronic parsing stuff.

Browse source 
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@357 a4c988fc-2ded-0310-b66e-134b36920a42
This commit is contained in:
lukemelia 2006-11-21 05:10:32 +00:00
parent b243e0d393
commit fd67a7341e
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tracks/app/views/todo/_edit_form.rhtml
View file

@ -36,12 +36,12 @@
</tr>
<tr>
<td class="label"><label for="item_due">Due</td>
<td><input name="item[due]" id="due_<%= @item.id %>" type="text" value="<%= format_date(@item.due) %>" tabindex="5" size="10" onFocus="Calendar.setup" /></td>
<td><input name="item[due]" id="due_<%= @item.id %>" type="text" value="<%= format_date(@item.due) %>" tabindex="5" size="10" onFocus="Calendar.setup" autocomplete="off" class="Date" /></td>
</tr>
<% if @item.current_state == :deferred -%>
<tr>
<td class="label"><label for="item_show_from">Show from</td>
<td><input name="item[show_from]" id="show_from_<%= @item.id %>" type="text" value="<%= format_date(@item.show_from) %>" tabindex="5" size="10" onFocus="Calendar.setup" /></td>
<td><input name="item[show_from]" id="show_from_<%= @item.id %>" type="text" value="<%= format_date(@item.show_from) %>" tabindex="5" size="10" onFocus="Calendar.setup" autocomplete="off" class="Date" /></td>
</tr>
<% end -%>
<% if controller.controller_name == "project" || @item.deferred? -%>
@ -54,6 +54,4 @@
</table>
<%= calendar_setup( "due_#{@item.id}" ) %>
<% if @item.deferred? -%>
<%= calendar_setup( "show_from_#{@item.id}" ) %>
<% end -%>
<%= calendar_setup( "show_from_#{@item.id}" ) %>

6
tracks/public/javascripts/calendar-setup.js
View file

@ -196,10 +196,10 @@ Calendar.setup = function (params) {
return false;
};
if (params.inputField) {
new DateDueKeyboardShortcutSupport(params.inputField, params.ifFormat, cal);
/* if (params.inputField) {
new DateDueKeyboardShortcutSupport(params.inputField, params.ifFormat, cal);
}
*/
return cal;
};