diff options
Diffstat (limited to 'app/views/users')
| -rw-r--r-- | app/views/users/_general.html.erb | 2 | ||||
| -rw-r--r-- | app/views/users/_groups.html.erb | 2 | ||||
| -rw-r--r-- | app/views/users/_memberships.html.erb | 8 | ||||
| -rw-r--r-- | app/views/users/_preferences.html.erb | 2 | ||||
| -rw-r--r-- | app/views/users/index.html.erb | 2 | ||||
| -rw-r--r-- | app/views/users/new.html.erb | 2 |
6 files changed, 10 insertions, 8 deletions
diff --git a/app/views/users/_general.html.erb b/app/views/users/_general.html.erb index b332e856e..0daa421c7 100644 --- a/app/views/users/_general.html.erb +++ b/app/views/users/_general.html.erb @@ -1,4 +1,4 @@ -<% labelled_form_for @user do |f| %> +<%= labelled_form_for @user do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> <% if @user.active? && email_delivery_enabled? -%> <p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p> diff --git a/app/views/users/_groups.html.erb b/app/views/users/_groups.html.erb index 0ab2f11eb..e24296ef0 100644 --- a/app/views/users/_groups.html.erb +++ b/app/views/users/_groups.html.erb @@ -1,4 +1,4 @@ -<% form_for(:user, :url => { :action => 'update' }, :html => {:method => :put}) do %> +<%= form_for(:user, :url => { :action => 'update' }, :html => {:method => :put}) do %> <div class="box"> <% Group.all.sort.each do |group| %> <label><%= check_box_tag 'user[group_ids][]', group.id, @user.groups.include?(group) %> <%=h group %></label><br /> diff --git a/app/views/users/_memberships.html.erb b/app/views/users/_memberships.html.erb index 51fb11106..a480d2ac7 100644 --- a/app/views/users/_memberships.html.erb +++ b/app/views/users/_memberships.html.erb @@ -19,8 +19,10 @@ </td> <td class="roles"> <span id="member-<%= membership.id %>-roles"><%=h membership.roles.sort.collect(&:to_s).join(', ') %></span> - <% remote_form_for(:membership, :url => user_membership_path(@user, membership), :method => :put, - :html => { :id => "member-#{membership.id}-roles-form", :style => 'display:none;'}) do %> + <%= form_for(:membership, :remote => true, + :url => user_membership_path(@user, membership), :method => :put, + :html => {:id => "member-#{membership.id}-roles-form", + :style => 'display:none;'}) do %> <p><% roles.each do |role| %> <label><%= check_box_tag 'membership[role_ids][]', role.id, membership.roles.include?(role), :disabled => membership.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br /> @@ -57,7 +59,7 @@ <div class="splitcontentright"> <% if projects.any? %> <fieldset><legend><%=l(:label_project_new)%></legend> -<% remote_form_for(:membership, :url => user_memberships_path(@user)) do %> +<%= form_for(:membership, :remote => true, :url => user_memberships_path(@user)) do %> <%= select_tag 'membership[project_id]', options_for_membership_project_select(@user, projects) %> <p><%= l(:label_role_plural) %>: <% roles.each do |role| %> diff --git a/app/views/users/_preferences.html.erb b/app/views/users/_preferences.html.erb index a5a0e5cb1..26e83b123 100644 --- a/app/views/users/_preferences.html.erb +++ b/app/views/users/_preferences.html.erb @@ -1,4 +1,4 @@ -<% labelled_fields_for :pref, @user.pref do |pref_fields| %> +<%= labelled_fields_for :pref, @user.pref do |pref_fields| %> <p><%= pref_fields.check_box :hide_mail %></p> <p><%= pref_fields.select :time_zone, ActiveSupport::TimeZone.all.collect {|z| [ z.to_s, z.name ]}, :include_blank => true %></p> <p><%= pref_fields.select :comments_sorting, [[l(:label_chronological_order), 'asc'], [l(:label_reverse_chronological_order), 'desc']] %></p> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 3decdc971..d23be4ad2 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -4,7 +4,7 @@ <h2><%=l(:label_user_plural)%></h2> -<% form_tag({}, :method => :get) do %> +<%= form_tag({}, :method => :get) do %> <fieldset><legend><%= l(:label_filter_plural) %></legend> <label for='status'><%= l(:field_status) %>:</label> <%= select_tag 'status', users_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;" %> diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index eb8a9f93d..3eecf4a20 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -1,6 +1,6 @@ <h2><%= link_to l(:label_user_plural), users_path %> » <%=l(:label_user_new)%></h2> -<% labelled_form_for @user do |f| %> +<%= labelled_form_for @user do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> <% if email_delivery_enabled? %> <p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p> |