jro_apps/redmine Commit - r127:ff65a5b22a54

added multiple file upload for documents and files modules...

Jean-Philippe Lang -

r127:ff65a5b22a54

parent child

Context file:

r127:ff65a5b22a54

Collapse all files

app/controllers/documents_controller.rb +4 -6

                end
                def add_attachment
-                 # Save the attachment
-                 if params[:attachment][:file].size > 0
-                   @attachment = @document.attachments.build(params[:attachment])
-                   @attachment.author_id = self.logged_in_user.id if self.logged_in_user
-                   @attachment.save
-                 end
+                 # Save the attachments
+                 params[:attachments].each { |a|
+                   Attachment.create(:container => @document, :file => a, :author => logged_in_user) unless a.size == 0
+                 } if params[:attachments] and params[:attachments].is_a? Array
                  redirect_to :action => 'show', :id => @document
                end

app/controllers/projects_controller.rb +14 -18

                def add_document
                  @categories = Enumeration::get_values('DCAT')
                  @document = @project.documents.build(params[:document])
-                 if request.post?
-                   # Save the attachment
-                   if params[:attachment][:file].size > 0
-                     @attachment = @document.attachments.build(params[:attachment])
-                     @attachment.author_id = self.logged_in_user.id if self.logged_in_user
-                   end
-                   if @document.save
-                     flash[:notice] = l(:notice_successful_create)
-                     redirect_to :action => 'list_documents', :id => @project
-                   end
+                 if request.post? and @document.save
+                   # Save the attachments
+                   params[:attachments].each { |a|
+                     Attachment.create(:container => @document, :file => a, :author => logged_in_user) unless a.size == 0
+                   } if params[:attachments] and params[:attachments].is_a? Array
+                   flash[:notice] = l(:notice_successful_create)
+                   redirect_to :action => 'list_documents', :id => @project
                  end
                end
                end
                def add_file
-                 @attachment = Attachment.new(params[:attachment])
-                 if request.post? and params[:attachment][:file].size > 0
-                   @attachment.container = @project.versions.find_by_id(params[:version_id])
-                   @attachment.author = logged_in_user
-                   if @attachment.save
-                     flash[:notice] = l(:notice_successful_create)
-                     redirect_to :controller => 'projects', :action => 'list_files', :id => @project
-                   end
+                 if request.post?
+                   @version = @project.versions.find_by_id(params[:version_id])
+                   # Save the attachments
+                   params[:attachments].each { |a|
+                     Attachment.create(:container => @version, :file => a, :author => logged_in_user) unless a.size == 0
+                   } if params[:attachments] and params[:attachments].is_a? Array
+                   redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                  end
                  @versions = @project.versions
                end

app/views/documents/show.rhtml +4 -3

              <% if authorize_for('documents', 'add_attachment') %>
-               <%= start_form_tag ({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true) %>
-               <label><%=l(:label_attachment_new)%></label>&nbsp;&nbsp;
-               <%= file_field 'attachment', 'file'  %>
+               <%= start_form_tag ({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :class => "tabular") %>
+                 <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>&nbsp;
+                 <%= link_to_function image_tag('add'), "addFileField()" %></label>
+                 <%= file_field_tag 'attachments[]', :size => 30  %></p>
                <%= submit_tag l(:button_add) %>
                <%= end_form_tag %>
              <% end %>

app/views/projects/add_document.rhtml +3 -2

              <%= render :partial => 'documents/form' %>
              <div class="box">
-             <p><label for="attachment_file"><%=l(:label_attachment)%></label>
-             <%= file_field 'attachment', 'file' %></p>
+             <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>&nbsp;
+             <%= link_to_function image_tag('add'), "addFileField()" %></label>
+             <%= file_field_tag 'attachments[]', :size => 30  %></p>
              </div>
              <%= submit_tag l(:button_create) %>

app/views/projects/add_file.rhtml +3 -2

              <p><label for="version_id"><%=l(:field_version)%> <span class="required">*</span></label>
              <%= select_tag "version_id", options_from_collection_for_select(@versions, "id", "name") %></p>
-             <p><label for="attachment_file"><%=l(:label_attachment)%> <span class="required">*</span></label>
-             <%= file_field 'attachment', 'file'  %></p>
+             <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>&nbsp;
+             <%= link_to_function image_tag('add'), "addFileField()" %></label>
+             <%= file_field_tag 'attachments[]', :size => 30  %></p>
              </div>
              <%= submit_tag l(:button_add) %>
              <%= end_form_tag %> 
  No newline at end of file

public/javascripts/application.js 0 -1

                  p = document.getElementById("attachments_p");
                  p.appendChild(document.createElement("br"));
-                 p.appendChild(document.createElement("br"));
                  p.appendChild(f);
              }
  No newline at end of file

public/stylesheets/application.css +1 0

              input, select {
              	vertical-align: middle;
+             	margin-bottom: 4px;
              }
              input.button-small

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages