Use multipart forms for objects that may have file custom fields (#6719).

git-svn-id: http://svn.redmine.org/redmine/trunk@16068 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/documents/edit.html.erb b/app/views/documents/edit.html.erb
index 15491168df997582ad661867bfa69aaf5663fd3e..87e08e136423cf91ae25d04b5e0161458605be22 100644 (file)
--- a/app/views/documents/edit.html.erb
+++ b/app/views/documents/edit.html.erb
@@ -1,6 +1,6 @@
 <h2><%=l(:label_document)%></h2>
 
-<%= labelled_form_for @document do |f| %>
+<%= labelled_form_for @document, :html => {:multipart => true} do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
   <p><%= submit_tag l(:button_save) %></p>
 <% end %>

diff --git a/app/views/enumerations/edit.html.erb b/app/views/enumerations/edit.html.erb
index 59a7aa6baef547143290c8de5129321ce7b34eda..a7d03ced77b99c9530562f3922db03663ba2bbe3 100644 (file)
--- a/app/views/enumerations/edit.html.erb
+++ b/app/views/enumerations/edit.html.erb
@@ -1,6 +1,6 @@
 <%= title [l(@enumeration.option_name), enumerations_path], @enumeration.name %>
 
-<%= labelled_form_for :enumeration, @enumeration, :url => enumeration_path(@enumeration), :html => {:method => :put} do |f| %>
+<%= labelled_form_for :enumeration, @enumeration, :url => enumeration_path(@enumeration), :html => {:method => :put, :multipart => true} do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
   <%= submit_tag l(:button_save) %>
 <% end %>

diff --git a/app/views/enumerations/new.html.erb b/app/views/enumerations/new.html.erb
index 1714e8e8977ccd60900db452f8df03d2a43cdf69..dcd9a495c20481201924fce602740a23db887654 100644 (file)
--- a/app/views/enumerations/new.html.erb
+++ b/app/views/enumerations/new.html.erb
@@ -1,6 +1,6 @@
 <%= title [l(@enumeration.option_name), enumerations_path], l(:label_enumeration_new) %>
 
-<%= labelled_form_for :enumeration, @enumeration, :url => enumerations_path do |f| %>
+<%= labelled_form_for :enumeration, @enumeration, :url => enumerations_path, :html => {:multipart => true} do |f| %>
   <%= f.hidden_field :type  %>
   <%= render :partial => 'form', :locals => {:f => f} %>
   <%= submit_tag l(:button_create) %>

diff --git a/app/views/groups/_general.html.erb b/app/views/groups/_general.html.erb
index c48f54cd440de36c27824e15e659e7fc4381fec0..9cc5be6c3100b0464e3e7463c18c2f2bd9f20915 100644 (file)
--- a/app/views/groups/_general.html.erb
+++ b/app/views/groups/_general.html.erb
@@ -1,4 +1,4 @@
-<%= labelled_form_for @group, :url => group_path(@group) do |f| %>
+<%= labelled_form_for @group, :url => group_path(@group), :html => {:multipart => true} do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
 <% end %>

diff --git a/app/views/groups/new.html.erb b/app/views/groups/new.html.erb
index 2a7f0034a18e31c6a4e81d385e7ef8f3c485c1f1..c643161fdd68df2e5849a752a3ae7ef234e6d503 100644 (file)
--- a/app/views/groups/new.html.erb
+++ b/app/views/groups/new.html.erb
@@ -1,6 +1,6 @@
 <%= title [l(:label_group_plural), groups_path], l(:label_group_new) %>
 
-<%= labelled_form_for @group do |f| %>
+<%= labelled_form_for @group, :html => {:multipart => true} do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <p>
   <%= f.submit l(:button_create) %>

diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index ca8a1441ebe40c23f0e986a96baaa05e1494641a..44c75f2a31bad7d11ec0c33a184e32f8e883218e 100644 (file)
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -14,7 +14,7 @@
 <%= labelled_form_for :user, @user,
                      :url => { :action => "account" },
                      :html => { :id => 'my_account_form',
-                                :method => :post } do |f| %>
+                                :method => :post, :multipart => true } do |f| %>
 <div class="splitcontentleft">
 <fieldset class="box tabular">
   <legend><%=l(:label_information_plural)%></legend>

diff --git a/app/views/projects/_edit.html.erb b/app/views/projects/_edit.html.erb
index 211762903c588f9d2f045a578a070c9b5b9984a8..5c60b17a89c42d504045ed251b36fa04441310c9 100644 (file)
--- a/app/views/projects/_edit.html.erb
+++ b/app/views/projects/_edit.html.erb
@@ -1,4 +1,4 @@
-<%= labelled_form_for @project do |f| %>
+<%= labelled_form_for @project, :html => {:multipart => true} do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
 <% end %>

diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb
index bd474bb79a4ee62ff15cc1c46c71f67801ec1fda..e593822a4a1588582646ef20d02d1ec3dc614692 100644 (file)
--- a/app/views/projects/new.html.erb
+++ b/app/views/projects/new.html.erb
@@ -1,6 +1,6 @@
 <%= title l(:label_project_new) %>
 
-<%= labelled_form_for @project do |f| %>
+<%= labelled_form_for @project, :html => {:multipart => true} 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/edit.html.erb b/app/views/timelog/edit.html.erb
index de0ea59932379f508c15a3abaa81e0fe2f8e3a9b..89a60b7ed341d886ff59df3caf922bb5008f3dee 100644 (file)
--- 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 => time_entry_path(@time_entry) do |f| %>
+<%= labelled_form_for @time_entry, :url => time_entry_path(@time_entry), :html => {:multipart => true} do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
   <%= submit_tag l(:button_save) %>
 <% end %>

diff --git a/app/views/timelog/new.html.erb b/app/views/timelog/new.html.erb
index 84bf7dae18151cbcfd6935cd5af14007eca22099..593eb2bc8d2f813ee32a77abeba267765d6b4986 100644 (file)
--- 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, :html => {:multipart => true} 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/users/_general.html.erb b/app/views/users/_general.html.erb
index 7d84c0ced5fbc854b6b07b03b08358dea265e5ac..fddea54bba94d8e5015f7a6fb2bd45bf26b42d06 100644 (file)
--- 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, :html => {:multipart => true} do |f| %>
   <%= render :partial => 'form', :locals => { :f => f } %>
   <% if @user.active? && email_delivery_enabled? && @user != User.current -%>
     <p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p>

diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 255788e027c31f73c70d1a8af7b4ae4bafbd1ebb..e9eb102f8de284d5c463774ffbb493fd70ba0a79 100644 (file)
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -1,6 +1,6 @@
 <%= title [l(:label_user_plural), users_path], l(:label_user_new) %>
 
-<%= labelled_form_for @user do |f| %>
+<%= labelled_form_for @user, :html => {:multipart => true} 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>

diff --git a/app/views/versions/edit.html.erb b/app/views/versions/edit.html.erb
index 3c67f09c055fbf5f1ba7d55f9582193064b5545f..db6bb84e5447b176b0b400f6bd37fa8cff5c4098 100644 (file)
--- a/app/views/versions/edit.html.erb
+++ b/app/views/versions/edit.html.erb
@@ -1,6 +1,6 @@
 <h2><%=l(:label_version)%></h2>
 
-<%= labelled_form_for @version do |f| %>
+<%= labelled_form_for @version, :html => {:multipart => true} do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
 <% end %>

diff --git a/app/views/versions/new.html.erb b/app/views/versions/new.html.erb
index c63edade7eeef4f0ed10aee53b23796f8f6ae945..b52436dbbe833e644367eb10046090f2b9887069 100644 (file)
--- a/app/views/versions/new.html.erb
+++ b/app/views/versions/new.html.erb
@@ -1,6 +1,6 @@
 <h2><%=l(:label_version_new)%></h2>
 
-<%= labelled_form_for @version, :url => project_versions_path(@project) do |f| %>
+<%= labelled_form_for @version, :url => project_versions_path(@project), :html => {:multipart => true} do |f| %>
 <%= render :partial => 'versions/form', :locals => { :f => f } %>
 <%= submit_tag l(:button_create) %>
 <% end %>