diff options
Diffstat (limited to 'app/views/calendars')
| -rw-r--r-- | app/views/calendars/show.html.erb | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/app/views/calendars/show.html.erb b/app/views/calendars/show.html.erb index b2d1c5cd2..0b9d67727 100644 --- a/app/views/calendars/show.html.erb +++ b/app/views/calendars/show.html.erb @@ -1,7 +1,7 @@ <h2><%= @query.new_record? ? l(:label_calendar) : h(@query.name) %></h2> -<% form_tag(calendar_path, :method => :put, :id => 'query_form') do %> - <%= hidden_field_tag('project_id', @project.to_param) if @project%> +<% form_tag({:controller => 'calendars', :action => 'show', :project_id => @project}, :method => :get, :id => 'query_form') do %> +<%= hidden_field_tag 'set_filter', '1' %> <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>"> <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend> <div style="<%= @query.new_record? ? "" : "display: none;" %>"> @@ -10,7 +10,7 @@ </fieldset> <p style="float:right;"> - <%= link_to_previous_month(@year, @month, :project => @project) %> | <%= link_to_next_month(@year, @month, :project => @project) %> + <%= link_to_previous_month(@year, @month) %> | <%= link_to_next_month(@year, @month) %> </p> <p class="buttons"> @@ -19,17 +19,8 @@ <%= label_tag('year', l(:label_year)) %> <%= select_year(@year, :prefix => "year", :discard_type => true) %> -<%= link_to_remote l(:button_apply), - { :url => { :set_filter => 1 }, - :update => "content", - :with => "Form.serialize('query_form')" - }, :class => 'icon icon-checked' %> - -<%= link_to_remote l(:button_clear), - { :url => { :project_id => @project, :set_filter => 1 }, - :method => :put, - :update => "content", - }, :class => 'icon icon-reload' %> +<%= link_to_function l(:button_apply), '$("query_form").submit()', :class => 'icon icon-checked' %> +<%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 }, :class => 'icon icon-reload' %> </p> <% end %> |