diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-04-03 11:55:24 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-04-03 11:55:24 +0000 |
| commit | b0ade644d60c471e935f6b5f269d41824e0df8b8 (patch) | |
| tree | c89a8a5199b70ee3f1bfe48d148010a23d5a90c3 /app/views/timelog | |
| parent | 90ed0784458a16f57a73e2eb80bdcaa2398b092b (diff) | |
| download | redmine-b0ade644d60c471e935f6b5f269d41824e0df8b8.tar.gz redmine-b0ade644d60c471e935f6b5f269d41824e0df8b8.zip | |
Changed timelogs filters to use non-AJAX requests (#1965).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5297 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/timelog')
| -rw-r--r-- | app/views/timelog/_date_range.rhtml | 10 | ||||
| -rw-r--r-- | app/views/timelog/index.html.erb | 6 |
2 files changed, 4 insertions, 12 deletions
diff --git a/app/views/timelog/_date_range.rhtml b/app/views/timelog/_date_range.rhtml index 727de25ed..42ea53b71 100644 --- a/app/views/timelog/_date_range.rhtml +++ b/app/views/timelog/_date_range.rhtml @@ -4,7 +4,7 @@ <p> <%= radio_button_tag 'period_type', '1', !@free_period %> <%= select_tag 'period', options_for_period_select(params[:period]), - :onchange => 'this.form.onsubmit();', + :onchange => 'this.form.submit();', :onfocus => '$("period_type_1").checked = true;' %> </p> <p> @@ -17,12 +17,8 @@ </div> </fieldset> <p class="buttons"> - <%= link_to_remote l(:button_apply), - { :url => { }, - :update => "content", - :with => "Form.serialize('query_form')", - :method => :get - }, :class => 'icon icon-checked' %> + <%= link_to_function l(:button_apply), '$("query_form").submit()', :class => 'icon icon-checked' %> + <%= link_to l(:button_clear), {:controller => controller_name, :action => action_name, :project_id => @project, :issue_id => @issue}, :class => 'icon icon-reload' %> </p> <div class="tabs"> diff --git a/app/views/timelog/index.html.erb b/app/views/timelog/index.html.erb index 737476f35..d943d4303 100644 --- a/app/views/timelog/index.html.erb +++ b/app/views/timelog/index.html.erb @@ -6,11 +6,7 @@ <h2><%= l(:label_spent_time) %></h2> -<% form_remote_tag( :url => {}, :html => {:method => :get, :id => 'query_form'}, :method => :get, :update => 'content' ) do %> -<%# TOOD: remove the project_id and issue_id hidden fields, that information is -already in the URI %> -<%= hidden_field_tag('project_id', params[:project_id]) if @project %> -<%= hidden_field_tag 'issue_id', params[:issue_id] if @issue %> +<% form_tag({:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}, :method => :get, :id => 'query_form') do %> <%= render :partial => 'date_range' %> <% end %> |