jro_apps/redmine Commit - r2115:66ff4cb7de55

Files module: makes version field non required (#1053)....

Jean-Philippe Lang -

r2115:66ff4cb7de55

parent child

Context file:

r2115:66ff4cb7de55

Collapse all files

app/controllers/projects_controller.rb +8 -4

                def add_file
                  if request.post?
-                   @version = @project.versions.find_by_id(params[:version_id])
-                   attachments = attach_files(@version, params[:attachments])
-                   Mailer.deliver_attachments_added(attachments) if !attachments.empty? && Setting.notified_events.include?('file_added')
+                   container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
+                   attachments = attach_files(container, params[:attachments])
+                   if !attachments.empty? && Setting.notified_events.include?('file_added')
+                     Mailer.deliver_attachments_added(attachments)
+                   end
                    redirect_to :controller => 'projects', :action => 'list_files', :id => @project
+                   return
                  end
                  @versions = @project.versions.sort
                end
                def list_files
                  sort_init "#{Attachment.table_name}.filename", "asc"
                  sort_update
-                 @versions = @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
+                 @containers = [ Project.find(@project.id, :include => :attachments, :order => sort_clause)]
+                 @containers += @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
                  render :layout => !request.xhr?
                end

app/models/mailer.rb +3 0

                  added_to = ''
                  added_to_url = ''
                  case container.class.name
+                 when 'Project'
+                   added_to_url = url_for(:controller => 'projects', :action => 'list_files', :id => container)
+                   added_to = "#{l(:label_project)}: #{container}"
                  when 'Version'
                    added_to_url = url_for(:controller => 'projects', :action => 'list_files', :id => container.project_id)
                    added_to = "#{l(:label_version)}: #{container.name}"

app/models/project.rb +2 0

                                        :association_foreign_key => 'custom_field_id'
                acts_as_tree :order => "name", :counter_cache => true
+               acts_as_attachable :view_permission => :view_files,
+                                  :delete_permission => :manage_files
                acts_as_customizable
                acts_as_searchable :columns => ['name', 'description'], :project_key => 'id', :permission => nil

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

              <div class="box">
              <% form_tag({ :action => 'add_file', :id => @project }, :multipart => true, :class => "tabular") do %>
-             <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>
+             <% if @versions.any? %>
+             <p><label for="version_id"><%=l(:field_version)%></label>
+             <%= select_tag "version_id", content_tag('option', '') +
+             														 options_from_collection_for_select(@versions, "id", "name") %></p>
+             <% end %>
              <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
              </div>
              <%= submit_tag l(:button_add) %>
-             <% end %> 
  No newline at end of file
+             <% end %>

app/views/projects/list_files.rhtml +9 -12

              <table class="list">
                <thead><tr>
-                 <th><%=l(:field_version)%></th>
                  <%= sort_header_tag("#{Attachment.table_name}.filename", :caption => l(:field_filename)) %>
                  <%= sort_header_tag("#{Attachment.table_name}.created_on", :caption => l(:label_date), :default_order => 'desc') %>
                  <%= sort_header_tag("#{Attachment.table_name}.filesize", :caption => l(:field_filesize), :default_order => 'desc') %>
                  <%= sort_header_tag("#{Attachment.table_name}.downloads", :caption => l(:label_downloads_abbr), :default_order => 'desc') %>
                  <th>MD5</th>
-                 <% if delete_allowed %><th></th><% end %>
+                 <th></th>
                </tr></thead>
                <tbody>
-             <% for version in @versions %>
-               <% unless version.attachments.empty? %>
-               <tr><th colspan="7" align="left"><span class="icon icon-package"><b><%= version.name %></b></span></th></tr>
-               <% for file in version.attachments %>
+             <% @containers.each do |container| %>
+               <% next if container.attachments.empty? -%>
+             	<% if container.is_a?(Version) -%>
+               <tr><th colspan="6" align="left"><span class="icon icon-package"><b><%=h container %></b></span></th></tr>
+             	<% end -%>
+               <% container.attachments.each do |file| %>
                <tr class="<%= cycle("odd", "even") %>">
-                 <td></td>
                  <td><%= link_to_attachment file, :download => true, :title => file.description %></td>
                  <td align="center"><%= format_time(file.created_on) %></td>
                  <td align="center"><%= number_to_human_size(file.filesize) %></td>
                  <td align="center"><%= file.downloads %></td>
                  <td align="center"><small><%= file.digest %></small></td>
-                 <% if delete_allowed %>
                  <td align="center">
-                     <%= link_to image_tag('delete.png'), {:controller => 'attachments', :action => 'destroy', :id => file},
-             																						 :confirm => l(:text_are_you_sure), :method => :post %>
+                 <%= link_to(image_tag('delete.png'), {:controller => 'attachments', :action => 'destroy', :id => file},
+             																				 :confirm => l(:text_are_you_sure), :method => :post) if delete_allowed %>
                  </td>
-                 <% end %>
                </tr>
                <% end
                reset_cycle %>
-               <% end %>
              <% end %>
                </tbody>
              </table>

test/fixtures/attachments.yml +24 0

		@@ -85,4 +85,28 attachments_007:
85	85	filename: archive.zip
86	86	author_id: 1
87	87	content_type: application/octet-stream
	88	attachments_008:
	89	created_on: 2006-07-19 21:07:27 +02:00
	90	container_type: Project
	91	container_id: 1
	92	downloads: 0
	93	disk_filename: 060719210727_project_file.zip
	94	digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
	95	id: 8
	96	filesize: 320
	97	filename: project_file.zip
	98	author_id: 2
	99	content_type: application/octet-stream
	100	attachments_009:
	101	created_on: 2006-07-19 21:07:27 +02:00
	102	container_type: Version
	103	container_id: 1
	104	downloads: 0
	105	disk_filename: 060719210727_version_file.zip
	106	digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
	107	id: 9
	108	filesize: 452
	109	filename: version_file.zip
	110	author_id: 2
	111	content_type: application/octet-stream
88	112	No newline at end of file

test/functional/attachments_controller_test.rb +17 0

                  @request.session[:user_id] = 2
                  assert_difference 'Attachment.count', -1 do
                    post :destroy, :id => 3
+                   assert_response 302
+                 end
+               end
+               def test_destroy_project_attachment
+                 @request.session[:user_id] = 2
+                 assert_difference 'Attachment.count', -1 do
+                   post :destroy, :id => 8
+                   assert_response 302
+                 end
+               end
+               def test_destroy_version_attachment
+                 @request.session[:user_id] = 2
+                 assert_difference 'Attachment.count', -1 do
+                   post :destroy, :id => 9
+                   assert_response 302
                  end
                end

test/functional/projects_controller_test.rb +47 -2

              class ProjectsControllerTest < Test::Unit::TestCase
                fixtures :projects, :versions, :users, :roles, :members, :issues, :journals, :journal_details,
-                        :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages
+                        :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages,
+                        :attachments
                def setup
                  @controller = ProjectsController.new
                  assert_redirected_to 'admin/projects'
                  assert_nil Project.find_by_id(1)
                end
+               def test_add_file
+                 set_tmp_attachments_directory
+                 @request.session[:user_id] = 2
+                 Setting.notified_events << 'file_added'
+                 ActionMailer::Base.deliveries.clear
+                 assert_difference 'Attachment.count' do
+                   post :add_file, :id => 1, :version_id => '',
+                        :attachments => {'1' => {'file' => test_uploaded_file('testfile.txt', 'text/plain')}}
+                 end
+                 assert_redirected_to 'projects/list_files/ecookbook'
+                 a = Attachment.find(:first, :order => 'created_on DESC')
+                 assert_equal 'testfile.txt', a.filename
+                 assert_equal Project.find(1), a.container
+                 mail = ActionMailer::Base.deliveries.last
+                 assert_kind_of TMail::Mail, mail
+                 assert_equal "[eCookbook] New file", mail.subject
+                 assert mail.body.include?('testfile.txt')
+               end
+               def test_add_version_file
+                 set_tmp_attachments_directory
+                 @request.session[:user_id] = 2
+                 Setting.notified_events << 'file_added'
+                 assert_difference 'Attachment.count' do
+                   post :add_file, :id => 1, :version_id => '2',
+                        :attachments => {'1' => {'file' => test_uploaded_file('testfile.txt', 'text/plain')}}
+                 end
+                 assert_redirected_to 'projects/list_files/ecookbook'
+                 a = Attachment.find(:first, :order => 'created_on DESC')
+                 assert_equal 'testfile.txt', a.filename
+                 assert_equal Version.find(2), a.container
+               end
                def test_list_files
                  get :list_files, :id => 1
                  assert_response :success
                  assert_template 'list_files'
-                 assert_not_nil assigns(:versions)
+                 assert_not_nil assigns(:containers)
+                 # file attached to the project
+                 assert_tag :a, :content => 'project_file.zip',
+                                :attributes => { :href => '/attachments/download/8/project_file.zip' }
+                 # file attached to a project's version
+                 assert_tag :a, :content => 'version_file.zip',
+                                :attributes => { :href => '/attachments/download/9/version_file.zip' }
                end
                def test_changelog

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