From ede9a03405fb4ae78bf5542e0d629111fb340fc6 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Fri, 9 Dec 2011 18:40:28 +0000 Subject: [PATCH] Removed TabularFormBuilder references in views. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8142 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/application_helper.rb | 14 ++++++++++++++ app/views/issue_statuses/edit.html.erb | 2 +- app/views/issue_statuses/new.html.erb | 2 +- app/views/issues/_attributes.html.erb | 2 +- app/views/issues/_edit.html.erb | 2 +- app/views/my/account.html.erb | 4 +--- app/views/projects/settings/_repository.html.erb | 6 ++---- app/views/projects/settings/_wiki.html.erb | 6 ++---- app/views/trackers/edit.html.erb | 2 +- app/views/trackers/new.html.erb | 2 +- app/views/users/_general.html.erb | 2 +- app/views/users/_preferences.html.erb | 2 +- app/views/users/new.html.erb | 2 +- 13 files changed, 28 insertions(+), 20 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 58e1cf8ec..ddfc44a8c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -882,6 +882,20 @@ module ApplicationHelper form_for(*args, &proc) end + def labelled_fields_for(*args, &proc) + args << {} unless args.last.is_a?(Hash) + options = args.last + options.merge!({:builder => TabularFormBuilder}) + fields_for(*args, &proc) + end + + def labelled_remote_form_for(*args, &proc) + args << {} unless args.last.is_a?(Hash) + options = args.last + options.merge!({:builder => TabularFormBuilder}) + remote_form_for(*args, &proc) + end + def back_url_hidden_field_tag back_url = params[:back_url] || request.env['HTTP_REFERER'] back_url = CGI.unescape(back_url.to_s) diff --git a/app/views/issue_statuses/edit.html.erb b/app/views/issue_statuses/edit.html.erb index 82a1a2e55..584fe06a9 100644 --- a/app/views/issue_statuses/edit.html.erb +++ b/app/views/issue_statuses/edit.html.erb @@ -1,6 +1,6 @@

<%= link_to l(:label_issue_status_plural), issue_statuses_path %> » <%=h @issue_status %>

-<% form_for @issue_status, :builder => TabularFormBuilder do |f| %> +<% labelled_form_for @issue_status do |f| %> <%= render :partial => 'form', :locals => {:f => f} %> <%= submit_tag l(:button_save) %> <% end %> diff --git a/app/views/issue_statuses/new.html.erb b/app/views/issue_statuses/new.html.erb index cefd493b4..6ab77b214 100644 --- a/app/views/issue_statuses/new.html.erb +++ b/app/views/issue_statuses/new.html.erb @@ -1,6 +1,6 @@

<%= link_to l(:label_issue_status_plural), issue_statuses_path %> » <%=l(:label_issue_status_new)%>

-<% form_for @issue_status, :builder => TabularFormBuilder do |f| %> +<% labelled_form_for @issue_status do |f| %> <%= render :partial => 'form', :locals => {:f => f} %> <%= submit_tag l(:button_create) %> <% end %> diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb index 76bb624a3..c4a087dae 100644 --- a/app/views/issues/_attributes.html.erb +++ b/app/views/issues/_attributes.html.erb @@ -1,4 +1,4 @@ -<% fields_for :issue, @issue, :builder => TabularFormBuilder do |f| %> +<% labelled_fields_for :issue, @issue do |f| %>
<% if @issue.new_record? || @allowed_statuses.any? %> diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb index 022d159f1..ffffeb175 100644 --- a/app/views/issues/_edit.html.erb +++ b/app/views/issues/_edit.html.erb @@ -8,7 +8,7 @@ <% end %> <% if User.current.allowed_to?(:log_time, @project) %>
<%= l(:button_log_time) %> - <% fields_for :time_entry, @time_entry, { :builder => TabularFormBuilder, :lang => current_language} do |time_entry| %> + <% labelled_fields_for :time_entry, @time_entry do |time_entry| %>

<%= time_entry.text_field :hours, :size => 6, :label => :label_spent_time %> <%= l(:field_hours) %>

diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index e3bcd4504..f59c3dd1d 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -6,9 +6,7 @@

<%=l(:label_my_account)%>

<%= error_messages_for 'user' %> -<% form_for :user, @user, :url => { :action => "account" }, - :builder => TabularFormBuilder, - :lang => current_language, +<% labelled_form_for :user, @user, :url => { :action => "account" }, :html => { :id => 'my_account_form' } do |f| %>
diff --git a/app/views/projects/settings/_repository.html.erb b/app/views/projects/settings/_repository.html.erb index cba6c4e16..bbfc105de 100644 --- a/app/views/projects/settings/_repository.html.erb +++ b/app/views/projects/settings/_repository.html.erb @@ -1,7 +1,5 @@ -<% remote_form_for :repository, @repository, - :url => { :controller => 'repositories', :action => 'edit', :id => @project }, - :builder => TabularFormBuilder, - :lang => current_language do |f| %> +<% labelled_remote_form_for :repository, @repository, + :url => { :controller => 'repositories', :action => 'edit', :id => @project } do |f| %> <%= error_messages_for 'repository' %> diff --git a/app/views/projects/settings/_wiki.html.erb b/app/views/projects/settings/_wiki.html.erb index 00da93039..e627adc07 100644 --- a/app/views/projects/settings/_wiki.html.erb +++ b/app/views/projects/settings/_wiki.html.erb @@ -1,7 +1,5 @@ -<% remote_form_for :wiki, @wiki, - :url => { :controller => 'wikis', :action => 'edit', :id => @project }, - :builder => TabularFormBuilder, - :lang => current_language do |f| %> +<% labelled_remote_form_for :wiki, @wiki, + :url => { :controller => 'wikis', :action => 'edit', :id => @project } do |f| %> <%= error_messages_for 'wiki' %> diff --git a/app/views/trackers/edit.html.erb b/app/views/trackers/edit.html.erb index d7ba2591c..b553704a0 100644 --- a/app/views/trackers/edit.html.erb +++ b/app/views/trackers/edit.html.erb @@ -1,5 +1,5 @@

<%= link_to l(:label_tracker_plural), trackers_path %> » <%=h @tracker %>

-<% form_for @tracker, :builder => TabularFormBuilder do |f| %> +<% labelled_form_for @tracker do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> <% end %> diff --git a/app/views/trackers/new.html.erb b/app/views/trackers/new.html.erb index 93b0bc1ae..e48525793 100644 --- a/app/views/trackers/new.html.erb +++ b/app/views/trackers/new.html.erb @@ -1,5 +1,5 @@

<%= link_to l(:label_tracker_plural), trackers_path %> » <%=l(:label_tracker_new)%>

-<% form_for @tracker, :builder => TabularFormBuilder do |f| %> +<% labelled_form_for @tracker do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> <% end %> diff --git a/app/views/users/_general.html.erb b/app/views/users/_general.html.erb index de81e0365..b332e856e 100644 --- a/app/views/users/_general.html.erb +++ b/app/views/users/_general.html.erb @@ -1,4 +1,4 @@ -<% form_for @user, :builder => TabularFormBuilder do |f| %> +<% labelled_form_for @user do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> <% if @user.active? && email_delivery_enabled? -%>

diff --git a/app/views/users/_preferences.html.erb b/app/views/users/_preferences.html.erb index 57f050b10..a5a0e5cb1 100644 --- a/app/views/users/_preferences.html.erb +++ b/app/views/users/_preferences.html.erb @@ -1,4 +1,4 @@ -<% fields_for :pref, @user.pref, :builder => TabularFormBuilder, :lang => current_language do |pref_fields| %> +<% labelled_fields_for :pref, @user.pref do |pref_fields| %>

<%= pref_fields.check_box :hide_mail %>

<%= pref_fields.select :time_zone, ActiveSupport::TimeZone.all.collect {|z| [ z.to_s, z.name ]}, :include_blank => true %>

<%= pref_fields.select :comments_sorting, [[l(:label_chronological_order), 'asc'], [l(:label_reverse_chronological_order), 'desc']] %>

diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index fc58b0988..eb8a9f93d 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -1,6 +1,6 @@

<%= link_to l(:label_user_plural), users_path %> » <%=l(:label_user_new)%>

-<% form_for @user, :builder => TabularFormBuilder do |f| %> +<% labelled_form_for @user do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> <% if email_delivery_enabled? %>