diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-04-25 17:17:49 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-04-25 17:17:49 +0000 |
| commit | 5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7 (patch) | |
| tree | 93e57765139714bd82dede475725516c448c0d55 /app/views/timelog | |
| parent | 34e20c4373b7f5a20ab3a132feae3f70f21ec477 (diff) | |
| download | redmine-5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7.tar.gz redmine-5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7.zip | |
Merged rails-3.2 branch.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/timelog')
| -rw-r--r-- | app/views/timelog/_date_range.html.erb | 4 | ||||
| -rw-r--r-- | app/views/timelog/_list.html.erb | 2 | ||||
| -rw-r--r-- | app/views/timelog/bulk_edit.html.erb | 2 | ||||
| -rw-r--r-- | app/views/timelog/edit.html.erb | 2 | ||||
| -rw-r--r-- | app/views/timelog/index.html.erb | 2 | ||||
| -rw-r--r-- | app/views/timelog/new.html.erb | 2 | ||||
| -rw-r--r-- | app/views/timelog/report.html.erb | 4 |
7 files changed, 10 insertions, 8 deletions
diff --git a/app/views/timelog/_date_range.html.erb b/app/views/timelog/_date_range.html.erb index 95e604dcf..086f78bc2 100644 --- a/app/views/timelog/_date_range.html.erb +++ b/app/views/timelog/_date_range.html.erb @@ -31,8 +31,8 @@ <% url_params = @free_period ? { :from => @from, :to => @to } : { :period => params[:period] } %> <ul> <li><%= link_to(l(:label_details), url_params.merge({:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue }), - :class => (@controller.action_name == 'index' ? 'selected' : nil)) %></li> + :class => (action_name == 'index' ? 'selected' : nil)) %></li> <li><%= link_to(l(:label_report), url_params.merge({:controller => 'timelog', :action => 'report', :project_id => @project, :issue_id => @issue}), - :class => (@controller.action_name == 'report' ? 'selected' : nil)) %></li> + :class => (action_name == 'report' ? 'selected' : nil)) %></li> </ul> </div> diff --git a/app/views/timelog/_list.html.erb b/app/views/timelog/_list.html.erb index 4e86d7833..e916756c9 100644 --- a/app/views/timelog/_list.html.erb +++ b/app/views/timelog/_list.html.erb @@ -1,4 +1,4 @@ -<% form_tag({}) do -%> +<%= form_tag({}) do -%> <%= hidden_field_tag 'back_url', url_for(params) %> <div class="autoscroll"> <table class="list time-entries"> diff --git a/app/views/timelog/bulk_edit.html.erb b/app/views/timelog/bulk_edit.html.erb index de1f9a365..dc0bd92f3 100644 --- a/app/views/timelog/bulk_edit.html.erb +++ b/app/views/timelog/bulk_edit.html.erb @@ -7,7 +7,7 @@ )}.join("\n").html_safe %> </ul> -<% form_tag(:action => 'bulk_update') do %> +<%= form_tag(:action => 'bulk_update') do %> <%= @time_entries.collect {|i| hidden_field_tag('ids[]', i.id)}.join.html_safe %> <div class="box tabular"> <div> diff --git a/app/views/timelog/edit.html.erb b/app/views/timelog/edit.html.erb index e5586e19a..db2e73cd5 100644 --- a/app/views/timelog/edit.html.erb +++ b/app/views/timelog/edit.html.erb @@ -1,6 +1,6 @@ <h2><%= l(:label_spent_time) %></h2> -<% labelled_form_for @time_entry, :url => project_time_entry_path(@time_entry.project, @time_entry) do |f| %> +<%= labelled_form_for @time_entry, :url => project_time_entry_path(@time_entry.project, @time_entry) do |f| %> <%= render :partial => 'form', :locals => {:f => f} %> <%= submit_tag l(:button_save) %> <% end %> diff --git a/app/views/timelog/index.html.erb b/app/views/timelog/index.html.erb index c3a63436e..52c9118e7 100644 --- a/app/views/timelog/index.html.erb +++ b/app/views/timelog/index.html.erb @@ -8,7 +8,7 @@ <h2><%= l(:label_spent_time) %></h2> -<% form_tag({:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}, :method => :get, :id => 'query_form') do %> +<%= form_tag({:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}, :method => :get, :id => 'query_form') do %> <%= render :partial => 'date_range' %> <% end %> diff --git a/app/views/timelog/new.html.erb b/app/views/timelog/new.html.erb index f37574397..84bf7dae1 100644 --- a/app/views/timelog/new.html.erb +++ b/app/views/timelog/new.html.erb @@ -1,6 +1,6 @@ <h2><%= l(:label_spent_time) %></h2> -<% labelled_form_for @time_entry, :url => time_entries_path do |f| %> +<%= labelled_form_for @time_entry, :url => time_entries_path do |f| %> <%= render :partial => 'form', :locals => {:f => f} %> <%= submit_tag l(:button_create) %> <%= submit_tag l(:button_create_and_continue), :name => 'continue' %> diff --git a/app/views/timelog/report.html.erb b/app/views/timelog/report.html.erb index 960d41b72..4b9f0befe 100644 --- a/app/views/timelog/report.html.erb +++ b/app/views/timelog/report.html.erb @@ -6,7 +6,9 @@ <h2><%= l(:label_spent_time) %></h2> -<% form_tag({:controller => 'timelog', :action => 'report', :project_id => @project, :issue_id => @issue}, :method => :get, :id => 'query_form') do %> +<%= form_tag({:controller => 'timelog', :action => 'report', + :project_id => @project, :issue_id => @issue}, + :method => :get, :id => 'query_form') do %> <% @report.criteria.each do |criterion| %> <%= hidden_field_tag 'criteria[]', criterion, :id => nil %> <% end %> |