jro_apps/redmine Commit - r3414:fe1e3ccd1842

Refactor: Decouple failed attachments and the flash messages...

Eric Davis -

r3414:fe1e3ccd1842

parent child

Context file:

r3414:fe1e3ccd1842

Collapse all files

app/controllers/application_controller.rb +5 0

                def api_request?
                  %w(xml json).include? params[:format]
                end
+               # Renders a warning flash if obj has unsaved attachments
+               def render_attachment_warning_if_needed(obj)
+                 flash[:warning] = l(:warning_attachments_not_saved, obj.unsaved_attachments.size) if obj.unsaved_attachments.present?
+               end
              end

app/controllers/documents_controller.rb +2 -2

                  @document = @project.documents.build(params[:document])
                  if request.post? and @document.save
                    attachments = Attachment.attach_files(@document, params[:attachments])
-                   flash[:warning] = attachments[:flash] if attachments[:flash]
+                   render_attachment_warning_if_needed(@document)
                    flash[:notice] = l(:notice_successful_create)
                    redirect_to :action => 'index', :project_id => @project
                  end
                def add_attachment
                  attachments = Attachment.attach_files(@document, params[:attachments])
-                 flash[:warning] = attachments[:flash] if attachments[:flash]
+                 render_attachment_warning_if_needed(@document)
                  Mailer.deliver_attachments_added(attachments[:files]) if attachments.present? && attachments[:files].present? && Setting.notified_events.include?('document_added')
                  redirect_to :action => 'show', :id => @document

app/controllers/issues_controller.rb +3 -2

                    call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue })
                    if @issue.save
                      attachments = Attachment.attach_files(@issue, params[:attachments])
-                     flash[:warning] = attachments[:flash] if attachments[:flash]
+                     render_attachment_warning_if_needed(@issue)
                      flash[:notice] = l(:notice_successful_create)
                      call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
                      respond_to do |format|
                  if @issue.valid?
                    attachments = Attachment.attach_files(@issue, params[:attachments])
-                   flash[:warning] = attachments[:flash] if attachments[:flash]
+                   render_attachment_warning_if_needed(@issue)
                    attachments[:files].each {|a| @journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
                    call_hook(:controller_issues_edit_before_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => @journal})
                    if @issue.save

app/controllers/messages_controller.rb +3 -3

                  if request.post? && @message.save
                    call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
                    attachments = Attachment.attach_files(@message, params[:attachments])
-                   flash[:warning] = attachments[:flash] if attachments[:flash]
+                   render_attachment_warning_if_needed(@message)
                    redirect_to :action => 'show', :id => @message
                  end
                end
                  if !@reply.new_record?
                    call_hook(:controller_messages_reply_after_save, { :params => params, :message => @reply})
                    attachments = Attachment.attach_files(@reply, params[:attachments])
-                   flash[:warning] = attachments[:flash] if attachments[:flash]
+                   render_attachment_warning_if_needed(@reply)
                  end
                  redirect_to :action => 'show', :id => @topic, :r => @reply
                end
                  end
                  if request.post? && @message.update_attributes(params[:message])
                    attachments = Attachment.attach_files(@message, params[:attachments])
-                   flash[:warning] = attachments[:flash] if attachments[:flash]
+                   render_attachment_warning_if_needed(@message)
                    flash[:notice] = l(:notice_successful_update)
                    @message.reload
                    redirect_to :action => 'show', :board_id => @message.board, :id => @message.root, :r => (@message.parent_id && @message.id)

app/controllers/projects_controller.rb +1 -1

                  if request.post?
                    container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
                    attachments = Attachment.attach_files(container, params[:attachments])
-                   flash[:warning] = attachments[:flash] if attachments[:flash]
+                   render_attachment_warning_if_needed(container)
                    if !attachments.empty? && Setting.notified_events.include?('file_added')
                      Mailer.deliver_attachments_added(attachments[:files])

app/controllers/wiki_controller.rb +3 -3

                  else
                    if !@page.new_record? && @content.text == params[:content][:text]
                      attachments = Attachment.attach_files(@page, params[:attachments])
-                     flash[:warning] = attachments[:flash] if attachments[:flash]
+                     render_attachment_warning_if_needed(@page)
                      # don't save if text wasn't changed
                      redirect_to :action => 'index', :id => @project, :page => @page.title
                      return
                    # if page is new @page.save will also save content, but not if page isn't a new record
                    if (@page.new_record? ? @page.save : @content.save)
                      attachments = Attachment.attach_files(@page, params[:attachments])
-                     flash[:warning] = attachments[:flash] if attachments[:flash]
+                     render_attachment_warning_if_needed(@page)
                      call_hook(:controller_wiki_edit_after_save, { :params => params, :page => @page})
                      redirect_to :action => 'index', :id => @project, :page => @page.title
                    end
                def add_attachment
                  return render_403 unless editable?
                  attachments = Attachment.attach_files(@page, params[:attachments])
-                 flash[:warning] = attachments[:flash] if attachments[:flash]
+                 render_attachment_warning_if_needed(@page)
                  redirect_to :action => 'index', :page => @page.title
                end

app/models/attachment.rb +2 -7

                # Returns a Hash of the results:
                # :files => array of the attached files
                # :unsaved => array of the files that could not be attached
-               # :flash => warning message
                def self.attach_files(obj, attachments)
                  attached = []
                  unsaved = []
-                 flash = nil
                  if attachments && attachments.is_a?(Hash)
                    attachments.each_value do |attachment|
                      file = attachment['file']
                                            :file => file,
                                            :description => attachment['description'].to_s.strip,
                                            :author => User.current)
-                     a.new_record? ? (unsaved << a) : (attached << a)
+                     a.new_record? ? (obj.unsaved_attachments << a) : (attached << a)
                    end
-                   if unsaved.any?
-                     flash = l(:warning_attachments_not_saved, unsaved.size)
-                   end
-                 end
-                 {:files => attached, :flash => flash, :unsaved => unsaved}
+                 {:files => attached, :unsaved => obj.unsaved_attachments}
                end
              private

vendor/plugins/acts_as_attachable/lib/acts_as_attachable.rb +6 0

                        has_many :attachments, options.merge(:as => :container,
                                                             :order => "#{Attachment.table_name}.created_on",
                                                             :dependent => :destroy)
+                       attr_accessor :unsaved_attachments
+                       after_initialize :initialize_unsaved_attachments
                        send :include, Redmine::Acts::Attachable::InstanceMethods
                      end
                    end
                        user.allowed_to?(self.class.attachable_options[:delete_permission], self.project)
                      end
+                     def initialize_unsaved_attachments
+                       @unsaved_attachments ||= []
+                     end
                      module ClassMethods
                      end
                    end

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