jro_apps/redmine Commit - r15268:19492226f7b2

Ability to delete multiple attachments while updating an issue (#13072)....

Jean-Philippe Lang -

r15268:19492226f7b2

parent child

Context file:

r15268:19492226f7b2

Collapse all files

app/models/issue.rb +16 -1

               DONE_RATIO_OPTIONS = %w(issue_field issue_status)
+              attr_accessor :deleted_attachment_ids
               attr_reader :current_journal
               delegate :notes, :notes=, :private_notes, :private_notes=, :to => :current_journal, :allow_nil => true
                           :force_updated_on_change, :update_closed_on, :set_assigned_to_was
               after_save {|issue| issue.send :after_project_change if !issue.id_changed? && issue.project_id_changed?}
               after_save :reschedule_following_issues, :update_nested_set_attributes,
-                         :update_parent_attributes, :create_journal
+                         :update_parent_attributes, :delete_selected_attachments, :create_journal
               # Should be after_create but would be called before previous after_save callbacks
               after_save :after_create_from_copy
               after_destroy :update_parent_attributes
                 write_attribute(:description, arg)
               end
+              def deleted_attachment_ids
+                Array(@deleted_attachment_ids).map(&:to_i)
+              end
               # Overrides assign_attributes so that project and tracker get assigned first
               def assign_attributes_with_project_and_tracker_first(new_attributes, *args)
                 return if new_attributes.nil?
                 :if => lambda {|issue, user| (issue.new_record? || issue.attributes_editable?(user)) &&
                   user.allowed_to?(:manage_subtasks, issue.project)}
+              safe_attributes 'deleted_attachment_ids',
+                :if => lambda {|issue, user| issue.attachments_deletable?(user)}
               def safe_attribute_names(user=nil)
                 names = super
                 names -= disabled_core_fields
                 end
               end
+              def delete_selected_attachments
+                if deleted_attachment_ids.present?
+                  objects = attachments.where(:id => deleted_attachment_ids.map(&:to_i))
+                  attachments.delete(objects)
+                end
+              end
               # Callback on file attachment
               def attachment_added(attachment)
                 if current_journal && !attachment.new_record?

app/views/issues/_edit.html.erb +21 -1

@@ -40,7 +40,27
40	</fieldset>	40	</fieldset>
41		41
42	<fieldset><legend><%= l(:label_attachment_plural) %></legend>	42	<fieldset><legend><%= l(:label_attachment_plural) %></legend>
43	<p><%= render :partial => 'attachments/form', :locals => {:container => @issue} %></p>	43	<% if @issue.attachments.any? && @issue.safe_attribute?('deleted_attachment_ids') %>
		44	<div class="contextual"><%= link_to l(:label_edit_attachments), '#', :onclick => "$('#existing-attachments').toggle(); return false;" %></div>
		45	<div id="existing-attachments" style="<%= @issue.deleted_attachment_ids.blank? ? 'display:none;' : '' %>">
		46	<% @issue.attachments.each do \|attachment\| %>
		47	<span class="existing-attachment">
		48	<%= text_field_tag '', attachment.filename, :class => "filename", :disabled => true %>
		49	<label>
		50	<%= check_box_tag 'issue[deleted_attachment_ids][]',
		51	attachment.id,
		52	@issue.deleted_attachment_ids.include?(attachment.id),
		53	:id => nil, :class => "deleted_attachment" %> <%= l(:button_delete) %>
		54	</label>
		55	</span>
		56	<% end %>
		57	<hr />
		58	</div>
		59	<% end %>
		60
		61	<div id="new-attachments" style="display:inline-block;">
		62	<%= render :partial => 'attachments/form', :locals => {:container => @issue} %>
		63	</div>
44	</fieldset>	64	</fieldset>
45	<% end %>	65	<% end %>
46	</div>	66	</div>

public/javascripts/attachments.js +5 0

@@ -189,3 +189,8 function setupFileDrop() {
189	}	189	}
190		190
191	$(document).ready(setupFileDrop);	191	$(document).ready(setupFileDrop);
		192	$(document).ready(function(){
		193	$("input.deleted_attachment").change(function(){
		194	$(this).parents('.existing-attachment').toggleClass('deleted', $(this).is(":checked"));
		195	}).change();
		196	});

public/stylesheets/application.css +7 -7

               overflow: hidden;
               width: .6em; height: .6em;
             }
-            .contextual {float:right; white-space: nowrap; line-height:1.4em;margin-top:5px; padding-left: 10px; font-size:0.9em;}
+            .contextual {float:right; white-space: nowrap; line-height:1.4em;margin:5px 0px; padding-left: 10px; font-size:0.9em;}
             .contextual input, .contextual select {font-size:0.9em;}
             .message .contextual { margin-top: 0; }
             .check_box_group.bool_cf {border:0; background:inherit;}
             .check_box_group.bool_cf label {display: inline;}
-            #attachments_fields input.description {margin-left:4px; width:340px;}
+            #attachments_fields input.description, #existing-attachments input.description {margin-left:4px; width:340px;}
-            #attachments_fields span {display:block; white-space:nowrap;}
+            #attachments_fields>span, #existing-attachments>span {display:block; white-space:nowrap;}
-            #attachments_fields input.filename {border:0; height:1.8em; width:250px; color:#555; background-color:inherit; background:url(../images/attachment.png) no-repeat 1px 50%; padding-left:18px;}
+            #attachments_fields input.filename, #existing-attachments .filename {border:0; width:250px; color:#555; background-color:inherit; background:url(../images/attachment.png) no-repeat 1px 50%; padding-left:18px;}
+            #attachments_fields input.filename {height:1.8em;}
             #attachments_fields .ajax-waiting input.filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
             #attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
             #attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
             a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%; width:1px; display:inline-block; padding-left:16px;}
             a.remove-upload:hover {text-decoration:none !important;}
+            .existing-attachment.deleted .filename {text-decoration:line-through; color:#999 !important;}
             div.fileover { background-color: lavender; }
               background-position: 0% 50%;
               background-repeat: no-repeat;
               padding-left: 16px;
-            a.icon-only {
               display: inline-block;
               width: 0;
               height: 16px;
               font-size: 8px;
               vertical-align: text-bottom;
             }
-            a.icon-only::after {
+            .icon-only::after {
               content: "&nbsp;";
             }

test/functional/issues_controller_test.rb +38 0

@@ -3761,6 +3761,44 class IssuesControllerTest < ActionController::TestCase
3761	end	3761	end
3762	end	3762	end
3763		3763
		3764	def test_put_update_with_attachment_deletion_should_create_a_single_journal
		3765	set_tmp_attachments_directory
		3766	@request.session[:user_id] = 2
		3767
		3768	journal = new_record(Journal) do
		3769	assert_difference 'Attachment.count', -2 do
		3770	put :update,
		3771	:id => 3,
		3772	:issue => {
		3773	:notes => 'Removing attachments',
		3774	:deleted_attachment_ids => ['1', '5']
		3775	}
		3776	end
		3777	end
		3778	assert_equal 'Removing attachments', journal.notes
		3779	assert_equal 2, journal.details.count
		3780	end
		3781
		3782	def test_put_update_with_attachment_deletion_and_failure_should_preserve_selected_attachments
		3783	set_tmp_attachments_directory
		3784	@request.session[:user_id] = 2
		3785
		3786	assert_no_difference 'Journal.count' do
		3787	assert_no_difference 'Attachment.count' do
		3788	put :update,
		3789	:id => 3,
		3790	:issue => {
		3791	:subject => '',
		3792	:notes => 'Removing attachments',
		3793	:deleted_attachment_ids => ['1', '5']
		3794	}
		3795	end
		3796	end
		3797	assert_select 'input[name=?][value="1"][checked=checked]', 'issue[deleted_attachment_ids][]'
		3798	assert_select 'input[name=?][value="5"][checked=checked]', 'issue[deleted_attachment_ids][]'
		3799	assert_select 'input[name=?][value="6"]:not([checked])', 'issue[deleted_attachment_ids][]'
		3800	end
		3801
3764	def test_put_update_with_no_change	3802	def test_put_update_with_no_change
3765	issue = Issue.find(1)	3803	issue = Issue.find(1)
3766	issue.journals.clear	3804	issue.journals.clear

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