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/roles | |
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/roles')
-rw-r--r-- | app/views/roles/edit.html.erb | 2 | ||||
-rw-r--r-- | app/views/roles/new.html.erb | 2 | ||||
-rw-r--r-- | app/views/roles/permissions.html.erb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/roles/edit.html.erb b/app/views/roles/edit.html.erb index 3bb07c08f..7caca3002 100644 --- a/app/views/roles/edit.html.erb +++ b/app/views/roles/edit.html.erb @@ -1,6 +1,6 @@ <h2><%= link_to l(:label_role_plural), roles_path %> » <%=h @role.name %></h2> -<% labelled_form_for @role do |f| %> +<%= labelled_form_for @role do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> <%= submit_tag l(:button_save) %> <% end %> diff --git a/app/views/roles/new.html.erb b/app/views/roles/new.html.erb index 77f31a7c0..0e5dfeb9c 100644 --- a/app/views/roles/new.html.erb +++ b/app/views/roles/new.html.erb @@ -1,6 +1,6 @@ <h2><%= link_to l(:label_role_plural), roles_path %> » <%=l(:label_role_new)%></h2> -<% labelled_form_for @role do |f| %> +<%= labelled_form_for @role do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> <%= submit_tag l(:button_create) %> <% end %> diff --git a/app/views/roles/permissions.html.erb b/app/views/roles/permissions.html.erb index da8e1ad8b..af78715e0 100644 --- a/app/views/roles/permissions.html.erb +++ b/app/views/roles/permissions.html.erb @@ -1,6 +1,6 @@ <h2><%= link_to l(:label_role_plural), roles_path %> » <%=l(:label_permissions_report)%></h2> -<% form_tag(permissions_roles_path, :id => 'permissions_form') do %> +<%= form_tag(permissions_roles_path, :id => 'permissions_form') do %> <%= hidden_field_tag 'permissions[0]', '', :id => nil %> <div class="autoscroll"> <table class="list permissions"> |