Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-09-22 05:50:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #29 from 02strich/fixing_1063

Browse source 
Fixing bug #1063
This commit is contained in:
Reinier Balt 2011-10-22 02:12:14 -07:00
commit 3fd6a8a1fa
6 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/todos_controller.rb
View file

@ -137,7 +137,7 @@ class TodosController < ApplicationController
@projects = current_user.projects.find(:all) if @new_project_created @projects = current_user.projects.find(:all) if @new_project_created
@initial_context_name = params['default_context_name'] @initial_context_name = params['default_context_name']
@initial_project_name = params['default_project_name'] @initial_project_name = params['default_project_name']
@default_tags = @todo.project.default_tags unless @todo.project.nil? @initial_tags = params['initial_tag_list']
@status_message = t('todos.added_new_next_action') @status_message = t('todos.added_new_next_action')
@status_message += ' ' + t('todos.to_tickler') if @todo.deferred? @status_message += ' ' + t('todos.to_tickler') if @todo.deferred?
@status_message += ' ' + t('todos.in_pending_state') if @todo.pending? @status_message += ' ' + t('todos.in_pending_state') if @todo.pending?
@ -210,6 +210,7 @@ class TodosController < ApplicationController
@projects = current_user.projects.find(:all) if @new_project_created @projects = current_user.projects.find(:all) if @new_project_created
@initial_context_name = params['default_context_name'] @initial_context_name = params['default_context_name']
@initial_project_name = params['default_project_name'] @initial_project_name = params['default_project_name']
@initial_tags = params['initial_tag_list']
if @todos.size > 0 if @todos.size > 0
@default_tags = @todos[0].project.default_tags unless @todos[0].project.nil? @default_tags = @todos[0].project.default_tags unless @todos[0].project.nil?
else else
@ -619,7 +620,7 @@ class TodosController < ApplicationController
@contexts_to_show = @contexts.reject {|x| x.hide? } @contexts_to_show = @contexts.reject {|x| x.hide? }
# Set defaults for new_action # Set defaults for new_action
@initial_tag_name = @tag_name @initial_tags = @tag_name
unless @not_done_todos.empty? unless @not_done_todos.empty?
@context = current_user.contexts.find_by_id(@not_done_todos[0].context_id) @context = current_user.contexts.find_by_id(@not_done_todos[0].context_id)
end end

2
app/views/shared/_add_new_item_form.rhtml
View file

@ -3,6 +3,8 @@
@initial_context_name ||= @project.default_context.name unless @project.nil? || @project.default_context.nil? @initial_context_name ||= @project.default_context.name unless @project.nil? || @project.default_context.nil?
@initial_context_name ||= @contexts.first.name unless @contexts.first.nil? @initial_context_name ||= @contexts.first.name unless @contexts.first.nil?
@initial_project_name = @project.name unless @project.nil? @initial_project_name = @project.name unless @project.nil?
@initial_tags ||= @default_tags
@initial_tags ||= @project.default_tags unless @project.nil?
reset_tab_index reset_tab_index
-%> -%>
<div id="todo_new_action_container"> <div id="todo_new_action_container">

3
app/views/todos/_new_multi_todo_form.rhtml
View file

@ -19,7 +19,8 @@
<div class="page_name_auto_complete" id="context_list" style="display:none"></div> <div class="page_name_auto_complete" id="context_list" style="display:none"></div>
<label for="tag_list"><%= t('shared.tags_for_all_actions') %></label> <label for="tag_list"><%= t('shared.tags_for_all_actions') %></label>
<%= text_field_tag "multi_tag_list", @default_tags, :name=>:tag_list, :size => 30, :tabindex => next_tab_index %> <%= hidden_field_tag "initial_tag_list", @initial_tags%>
<%= text_field_tag "multi_tag_list", @initial_tags, :name=>:tag_list, :size => 30, :tabindex => next_tab_index %>
<%= content_tag("div", "", :id => "tag_list_auto_complete", :class => "auto_complete") %> <%= content_tag("div", "", :id => "tag_list_auto_complete", :class => "auto_complete") %>
<%= check_box_tag('todos_sequential', 'true', false, {:tabindex => next_tab_index}) %> <%= check_box_tag('todos_sequential', 'true', false, {:tabindex => next_tab_index}) %>

3
app/views/todos/_new_todo_form.rhtml
View file

@ -23,7 +23,8 @@
<input id="todo_context_name" name="context_name" autocomplete="off" tabindex="<%= next_tab_index%>" size="30" type="text" value="<%= h(@initial_context_name) %>" /> <input id="todo_context_name" name="context_name" autocomplete="off" tabindex="<%= next_tab_index%>" size="30" type="text" value="<%= h(@initial_context_name) %>" />
<label for="todo_tag_list"><%= Todo.human_attribute_name('tags') + ' (' + t('shared.separate_tags_with_commas') + ')' %></label> <label for="todo_tag_list"><%= Todo.human_attribute_name('tags') + ' (' + t('shared.separate_tags_with_commas') + ')' %></label>
<%= text_field_tag "todo_tag_list", @default_tags, :size => 30, :tabindex => next_tab_index %> <%= hidden_field_tag "initial_tag_list", @initial_tags%>
<%= text_field_tag "todo_tag_list", @initial_tags, :size => 30, :tabindex => next_tab_index %>
<%= content_tag("div", "", :id => "tag_list_auto_complete", :class => "auto_complete") %> <%= content_tag("div", "", :id => "tag_list_auto_complete", :class => "auto_complete") %>
<div class="due_input"> <div class="due_input">

2
app/views/todos/create.js.erb
View file

@ -20,7 +20,7 @@ function clear_form() {
$('#todo-form-new-action').clearDeps(); $('#todo-form-new-action').clearDeps();
TracksForm.set_context_name('<%=escape_javascript @initial_context_name%>'); TracksForm.set_context_name('<%=escape_javascript @initial_context_name%>');
TracksForm.set_project_name('<%=escape_javascript @initial_project_name%>'); TracksForm.set_project_name('<%=escape_javascript @initial_project_name%>');
TracksForm.set_tag_list('<%=escape_javascript @default_tags%>'); TracksForm.set_tag_list('<%=escape_javascript @initial_tags%>');
$('#todo-form-new-action input:text:first').focus(); $('#todo-form-new-action input:text:first').focus();
$('#new_todo_starred_link .todo_star').removeClass('starred'); $('#new_todo_starred_link .todo_star').removeClass('starred');
$('#new_todo_starred').val('false'); $('#new_todo_starred').val('false');

2
app/views/todos/create_multiple.js.erb
View file

@ -28,7 +28,7 @@ function clear_form() {
$('#todo-form-multi-new-action').clearForm(); $('#todo-form-multi-new-action').clearForm();
TracksForm.set_context_name_for_multi_add('<%=escape_javascript @initial_context_name%>'); TracksForm.set_context_name_for_multi_add('<%=escape_javascript @initial_context_name%>');
TracksForm.set_project_name_for_multi_add('<%=escape_javascript @initial_project_name%>'); TracksForm.set_project_name_for_multi_add('<%=escape_javascript @initial_project_name%>');
TracksForm.set_tag_list_for_multi_add('<%=escape_javascript @default_tags%>'); TracksForm.set_tag_list_for_multi_add('<%=escape_javascript @initial_tags%>');
$('#todo-form-multi-new-action input:text:first').focus(); $('#todo-form-multi-new-action input:text:first').focus();
} }