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

              # redMine - project management software
              # Copyright (C) 2006-2007  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              require 'uri'
              require 'cgi'
              class ApplicationController < ActionController::Base
                include Redmine::I18n
                layout 'base'
                exempt_from_layout 'builder'
                # Remove broken cookie after upgrade from 0.8.x (#4292)
                # See https://rails.lighthouseapp.com/projects/8994/tickets/3360
                # TODO: remove it when Rails is fixed
                before_filter :delete_broken_cookies
                def delete_broken_cookies
                  if cookies['_redmine_session'] && cookies['_redmine_session'] !~ /--/
                    cookies.delete '_redmine_session'
                    redirect_to home_path
                    return false
                  end
                end
                before_filter :user_setup, :check_if_login_required, :set_localization
                filter_parameter_logging :password
                protect_from_forgery
                rescue_from ActionController::InvalidAuthenticityToken, :with => :invalid_authenticity_token
                include Redmine::Search::Controller
                include Redmine::MenuManager::MenuController
                helper Redmine::MenuManager::MenuHelper
                Redmine::Scm::Base.all.each do |scm|
                  require_dependency "repository/#{scm.underscore}"
                end
                def user_setup
                  # Check the settings cache for each request
                  Setting.check_cache
                  # Find the current user
                  User.current = find_current_user
                end
                # Returns the current user or nil if no user is logged in
                # and starts a session if needed
                def find_current_user
                  if session[:user_id]
                    # existing session
                    (User.active.find(session[:user_id]) rescue nil)
                  elsif cookies[:autologin] && Setting.autologin?
                    # auto-login feature starts a new session
                    user = User.try_to_autologin(cookies[:autologin])
                    session[:user_id] = user.id if user
                    user
                  elsif params[:format] == 'atom' && params[:key] && accept_key_auth_actions.include?(params[:action])
                    # RSS key authentication does not start a session
                    User.find_by_rss_key(params[:key])
                  elsif Setting.rest_api_enabled? && ['xml', 'json'].include?(params[:format])
                    if params[:key].present? && accept_key_auth_actions.include?(params[:action])
                      # Use API key
                      User.find_by_api_key(params[:key])
                    else
                      # HTTP Basic, either username/password or API key/random
                      authenticate_with_http_basic do |username, password|
                        User.try_to_login(username, password) || User.find_by_api_key(username)
                      end
                    end
                  end
                end
                # Sets the logged in user
                def logged_user=(user)
                  reset_session
                  if user && user.is_a?(User)
                    User.current = user
                    session[:user_id] = user.id
                  else
                    User.current = User.anonymous
                  end
                end
                # check if login is globally required to access the application
                def check_if_login_required
                  # no check needed if user is already logged in
                  return true if User.current.logged?
                  require_login if Setting.login_required?
                end
                def set_localization
                  lang = nil
                  if User.current.logged?
                    lang = find_language(User.current.language)
                  end
                  if lang.nil? && request.env['HTTP_ACCEPT_LANGUAGE']
                    accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first.downcase
                    if !accept_lang.blank?
                      lang = find_language(accept_lang) || find_language(accept_lang.split('-').first)
                    end
                  end
                  lang ||= Setting.default_language
                  set_language_if_valid(lang)
                end
                def require_login
                  if !User.current.logged?
                    # Extract only the basic url parameters on non-GET requests
                    if request.get?
                      url = url_for(params)
                    else
                      url = url_for(:controller => params[:controller], :action => params[:action], :id => params[:id], :project_id => params[:project_id])
                    end
                    respond_to do |format|
                      format.html { redirect_to :controller => "account", :action => "login", :back_url => url }
                      format.atom { redirect_to :controller => "account", :action => "login", :back_url => url }
                      format.xml { head :unauthorized }
                      format.json { head :unauthorized }
                    end
                    return false
                  end
                  true
                end
                def require_admin
                  return unless require_login
                  if !User.current.admin?
                    render_403
                    return false
                  end
                  true
                end
                def deny_access
                  User.current.logged? ? render_403 : require_login
                end
                # Authorize the user for the requested action
                def authorize(ctrl = params[:controller], action = params[:action], global = false)
                  allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project, :global => global)
                  allowed ? true : deny_access
                end
                # Authorize the user for the requested action outside a project
                def authorize_global(ctrl = params[:controller], action = params[:action], global = true)
                  authorize(ctrl, action, global)
                end
                # Find project of id params[:id]
                def find_project
                  @project = Project.find(params[:id])
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                # make sure that the user is a member of the project (or admin) if project is private
                # used as a before_filter for actions that do not require any particular permission on the project
                def check_project_privacy
                  if @project && @project.active?
                    if @project.is_public? || User.current.member_of?(@project) || User.current.admin?
                      true
                    else
                      User.current.logged? ? render_403 : require_login
                    end
                  else
                    @project = nil
                    render_404
                    false
                  end
                end
                def redirect_back_or_default(default)
                  back_url = CGI.unescape(params[:back_url].to_s)
                  if !back_url.blank?
                    begin
                      uri = URI.parse(back_url)
                      # do not redirect user to another host or to the login or register page
                      if (uri.relative? || (uri.host == request.host)) && !uri.path.match(%r{/(login|account/register)})
                        redirect_to(back_url)
                        return
                      end
                    rescue URI::InvalidURIError
                      # redirect to default
                    end
                  end
                  redirect_to default
                end
                def render_403
                  @project = nil
                  respond_to do |format|
                    format.html { render :template => "common/403", :layout => (request.xhr? ? false : 'base'), :status => 403 }
                    format.atom { head 403 }
                    format.xml { head 403 }
                    format.json { head 403 }
                  end
                  return false
                end
                def render_404
                  respond_to do |format|
                    format.html { render :template => "common/404", :layout => !request.xhr?, :status => 404 }
                    format.atom { head 404 }
                    format.xml { head 404 }
                    format.json { head 404 }
                  end
                  return false
                end
                def render_error(msg)
                  respond_to do |format|
                    format.html {
                      flash.now[:error] = msg
                      render :text => '', :layout => !request.xhr?, :status => 500
                    }
                    format.atom { head 500 }
                    format.xml { head 500 }
                    format.json { head 500 }
                  end
                end
                def invalid_authenticity_token
                  if api_request?
                    logger.error "Form authenticity token is missing or is invalid. API calls must include a proper Content-type header (text/xml or text/json)."
                  end
                  render_error "Invalid form authenticity token."
                end
                def render_feed(items, options={})
                  @items = items || []
                  @items.sort! {|x,y| y.event_datetime <=> x.event_datetime }
                  @items = @items.slice(0, Setting.feeds_limit.to_i)
                  @title = options[:title] || Setting.app_title
                  render :template => "common/feed.atom.rxml", :layout => false, :content_type => 'application/atom+xml'
                end
                def self.accept_key_auth(*actions)
                  actions = actions.flatten.map(&:to_s)
                  write_inheritable_attribute('accept_key_auth_actions', actions)
                end
                def accept_key_auth_actions
                  self.class.read_inheritable_attribute('accept_key_auth_actions') || []
                end
                # Returns the number of objects that should be displayed
                # on the paginated list
                def per_page_option
                  per_page = nil
                  if params[:per_page] && Setting.per_page_options_array.include?(params[:per_page].to_s.to_i)
                    per_page = params[:per_page].to_s.to_i
                    session[:per_page] = per_page
                  elsif session[:per_page]
                    per_page = session[:per_page]
                  else
                    per_page = Setting.per_page_options_array.first || 25
                  end
                  per_page
                end
                # qvalues http header parser
                # code taken from webrick
                def parse_qvalues(value)
                  tmp = []
                  if value
                    parts = value.split(/,\s*/)
                    parts.each {|part|
                      if m = %r{^([^\s,]+?)(?:;\s*q=(\d+(?:\.\d+)?))?$}.match(part)
                        val = m[1]
                        q = (m[2] or 1).to_f
                        tmp.push([val, q])
                      end
                    }
                    tmp = tmp.sort_by{|val, q| -q}
                    tmp.collect!{|val, q| val}
                  end
                  return tmp
                rescue
                  nil
                end
                # Returns a string that can be used as filename value in Content-Disposition header
                def filename_for_content_disposition(name)
                  request.env['HTTP_USER_AGENT'] =~ %r{MSIE} ? ERB::Util.url_encode(name) : name
                end
                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

              # redMine - project management software
              # Copyright (C) 2006-2007  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              class DocumentsController < ApplicationController
                default_search_scope :documents
                before_filter :find_project, :only => [:index, :new]
                before_filter :find_document, :except => [:index, :new]
                before_filter :authorize
                helper :attachments
                def index
                  @sort_by = %w(category date title author).include?(params[:sort_by]) ? params[:sort_by] : 'category'
                  documents = @project.documents.find :all, :include => [:attachments, :category]
                  case @sort_by
                  when 'date'
                    @grouped = documents.group_by {|d| d.updated_on.to_date }
                  when 'title'
                    @grouped = documents.group_by {|d| d.title.first.upcase}
                  when 'author'
                    @grouped = documents.select{|d| d.attachments.any?}.group_by {|d| d.attachments.last.author}
                  else
                    @grouped = documents.group_by(&:category)
                  end
                  @document = @project.documents.build
                  render :layout => false if request.xhr?
                end
                def show
                  @attachments = @document.attachments.find(:all, :order => "created_on DESC")
                end
                def new
                  @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
                end
                def edit
                  @categories = DocumentCategory.all
                  if request.post? and @document.update_attributes(params[:document])
                    flash[:notice] = l(:notice_successful_update)
                    redirect_to :action => 'show', :id => @document
                  end
                end
                def destroy
                  @document.destroy
                  redirect_to :controller => 'documents', :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
                end
              private
                def find_project
                  @project = Project.find(params[:project_id])
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def find_document
                  @document = Document.find(params[:id])
                  @project = @document.project
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
              end

app/controllers/issues_controller.rb +3 -2

              # Redmine - project management software
              # Copyright (C) 2006-2008  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              class IssuesController < ApplicationController
                menu_item :new_issue, :only => :new
                default_search_scope :issues
                before_filter :find_issue, :only => [:show, :edit, :update, :reply]
                before_filter :find_issues, :only => [:bulk_edit, :move, :destroy]
                before_filter :find_project, :only => [:new, :update_form, :preview]
                before_filter :authorize, :except => [:index, :changes, :gantt, :calendar, :preview, :context_menu]
                before_filter :find_optional_project, :only => [:index, :changes, :gantt, :calendar]
                accept_key_auth :index, :show, :changes
                rescue_from Query::StatementInvalid, :with => :query_statement_invalid
                helper :journals
                helper :projects
                include ProjectsHelper
                helper :custom_fields
                include CustomFieldsHelper
                helper :issue_relations
                include IssueRelationsHelper
                helper :watchers
                include WatchersHelper
                helper :attachments
                include AttachmentsHelper
                helper :queries
                include QueriesHelper
                helper :sort
                include SortHelper
                include IssuesHelper
                helper :timelog
                include Redmine::Export::PDF
                verify :method => [:post, :delete],
                       :only => :destroy,
                       :render => { :nothing => true, :status => :method_not_allowed }
                verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
                def index
                  retrieve_query
                  sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
                  sort_update({'id' => "#{Issue.table_name}.id"}.merge(@query.available_columns.inject({}) {|h, c| h[c.name.to_s] = c.sortable; h}))
                  if @query.valid?
                    limit = case params[:format]
                    when 'csv', 'pdf'
                      Setting.issues_export_limit.to_i
                    when 'atom'
                      Setting.feeds_limit.to_i
                    else
                      per_page_option
                    end
                    @issue_count = @query.issue_count
                    @issue_pages = Paginator.new self, @issue_count, limit, params['page']
                    @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
                                            :order => sort_clause,
                                            :offset => @issue_pages.current.offset,
                                            :limit => limit)
                    @issue_count_by_group = @query.issue_count_by_group
                    respond_to do |format|
                      format.html { render :template => 'issues/index.rhtml', :layout => !request.xhr? }
                      format.xml  { render :layout => false }
                      format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") }
                      format.csv  { send_data(issues_to_csv(@issues, @project), :type => 'text/csv; header=present', :filename => 'export.csv') }
                      format.pdf  { send_data(issues_to_pdf(@issues, @project, @query), :type => 'application/pdf', :filename => 'export.pdf') }
                    end
                  else
                    # Send html if the query is not valid
                    render(:template => 'issues/index.rhtml', :layout => !request.xhr?)
                  end
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def changes
                  retrieve_query
                  sort_init 'id', 'desc'
                  sort_update({'id' => "#{Issue.table_name}.id"}.merge(@query.available_columns.inject({}) {|h, c| h[c.name.to_s] = c.sortable; h}))
                  if @query.valid?
                    @journals = @query.journals(:order => "#{Journal.table_name}.created_on DESC",
                                                :limit => 25)
                  end
                  @title = (@project ? @project.name : Setting.app_title) + ": " + (@query.new_record? ? l(:label_changes_details) : @query.name)
                  render :layout => false, :content_type => 'application/atom+xml'
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def show
                  @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
                  @journals.each_with_index {|j,i| j.indice = i+1}
                  @journals.reverse! if User.current.wants_comments_in_reverse_order?
                  @changesets = @issue.changesets.visible.all
                  @changesets.reverse! if User.current.wants_comments_in_reverse_order?
                  @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                  @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                  @priorities = IssuePriority.all
                  @time_entry = TimeEntry.new
                  respond_to do |format|
                    format.html { render :template => 'issues/show.rhtml' }
                    format.xml  { render :layout => false }
                    format.atom { render :action => 'changes', :layout => false, :content_type => 'application/atom+xml' }
                    format.pdf  { send_data(issue_to_pdf(@issue), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf") }
                  end
                end
                # Add a new issue
                # The new issue will be created from an existing one if copy_from parameter is given
                def new
                  @issue = Issue.new
                  @issue.copy_from(params[:copy_from]) if params[:copy_from]
                  @issue.project = @project
                  # Tracker must be set before custom field values
                  @issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id] || :first)
                  if @issue.tracker.nil?
                    render_error l(:error_no_tracker_in_project)
                    return
                  end
                  if params[:issue].is_a?(Hash)
                    @issue.safe_attributes = params[:issue]
                    @issue.watcher_user_ids = params[:issue]['watcher_user_ids'] if User.current.allowed_to?(:add_issue_watchers, @project)
                  end
                  @issue.author = User.current
                  default_status = IssueStatus.default
                  unless default_status
                    render_error l(:error_no_default_issue_status)
                    return
                  end
                  @issue.status = default_status
                  @allowed_statuses = ([default_status] + default_status.find_new_statuses_allowed_to(User.current.roles_for_project(@project), @issue.tracker)).uniq
                  if request.get? || request.xhr?
                    @issue.start_date ||= Date.today
                  else
                    requested_status = IssueStatus.find_by_id(params[:issue][:status_id])
                    # Check that the user is allowed to apply the requested status
                    @issue.status = (@allowed_statuses.include? requested_status) ? requested_status : default_status
                    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|
                        format.html {
                          redirect_to(params[:continue] ? { :action => 'new', :tracker_id => @issue.tracker } :
                                                          { :action => 'show', :id => @issue })
                        }
                        format.xml  { render :action => 'show', :status => :created, :location => url_for(:controller => 'issues', :action => 'show', :id => @issue) }
                      end
                      return
                    else
                      respond_to do |format|
                        format.html { }
                        format.xml  { render(:xml => @issue.errors, :status => :unprocessable_entity); return }
                      end
                    end
                  end
                  @priorities = IssuePriority.all
                  render :layout => !request.xhr?
                end
                # Attributes that can be updated on workflow transition (without :edit permission)
                # TODO: make it configurable (at least per role)
                UPDATABLE_ATTRS_ON_TRANSITION = %w(status_id assigned_to_id fixed_version_id done_ratio) unless const_defined?(:UPDATABLE_ATTRS_ON_TRANSITION)
                def edit
                  update_issue_from_params
                  respond_to do |format|
                    format.html { }
                    format.xml  { }
                  end
                end
                def update
                  update_issue_from_params
                  if issue_update
                    respond_to do |format|
                      format.html { redirect_back_or_default({:action => 'show', :id => @issue}) }
                      format.xml  { head :ok }
                    end
                  else
                    respond_to do |format|
                      format.html { render :action => 'edit' }
                      format.xml  { render :xml => @issue.errors, :status => :unprocessable_entity }
                    end
                  end
                rescue ActiveRecord::StaleObjectError
                  # Optimistic locking exception
                  flash.now[:error] = l(:notice_locking_conflict)
                  # Remove the previously added attachments if issue was not updated
                  attachments[:files].each(&:destroy) if attachments[:files]
                end
                def reply
                  journal = Journal.find(params[:journal_id]) if params[:journal_id]
                  if journal
                    user = journal.user
                    text = journal.notes
                  else
                    user = @issue.author
                    text = @issue.description
                  end
                  content = "#{ll(Setting.default_language, :text_user_wrote, user)}\\n> "
                  content << text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub('"', '\"').gsub(/(\r?\n|\r\n?)/, "\\n> ") + "\\n\\n"
                  render(:update) { |page|
                    page.<< "$('notes').value = \"#{content}\";"
                    page.show 'update'
                    page << "Form.Element.focus('notes');"
                    page << "Element.scrollTo('update');"
                    page << "$('notes').scrollTop = $('notes').scrollHeight - $('notes').clientHeight;"
                  }
                end
                # Bulk edit a set of issues
                def bulk_edit
                  if request.post?
                    attributes = (params[:issue] || {}).reject {|k,v| v.blank?}
                    attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
                    attributes[:custom_field_values].reject! {|k,v| v.blank?} if attributes[:custom_field_values]
                    unsaved_issue_ids = []
                    @issues.each do |issue|
                      journal = issue.init_journal(User.current, params[:notes])
                      issue.safe_attributes = attributes
                      call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
                      unless issue.save
                        # Keep unsaved issue ids to display them in flash error
                        unsaved_issue_ids << issue.id
                      end
                    end
                    if unsaved_issue_ids.empty?
                      flash[:notice] = l(:notice_successful_update) unless @issues.empty?
                    else
                      flash[:error] = l(:notice_failed_to_save_issues, :count => unsaved_issue_ids.size,
                                                                       :total => @issues.size,
                                                                       :ids => '#' + unsaved_issue_ids.join(', #'))
                    end
                    redirect_back_or_default({:controller => 'issues', :action => 'index', :project_id => @project})
                    return
                  end
                  @available_statuses = Workflow.available_statuses(@project)
                  @custom_fields = @project.all_issue_custom_fields
                end
                def move
                  @copy = params[:copy_options] && params[:copy_options][:copy]
                  @allowed_projects = []
                  # find projects to which the user is allowed to move the issue
                  if User.current.admin?
                    # admin is allowed to move issues to any active (visible) project
                    @allowed_projects = Project.find(:all, :conditions => Project.visible_by(User.current))
                  else
                    User.current.memberships.each {|m| @allowed_projects << m.project if m.roles.detect {|r| r.allowed_to?(:move_issues)}}
                  end
                  @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
                  @target_project ||= @project
                  @trackers = @target_project.trackers
                  @available_statuses = Workflow.available_statuses(@project)
                  if request.post?
                    new_tracker = params[:new_tracker_id].blank? ? nil : @target_project.trackers.find_by_id(params[:new_tracker_id])
                    unsaved_issue_ids = []
                    moved_issues = []
                    @issues.each do |issue|
                      changed_attributes = {}
                      [:assigned_to_id, :status_id, :start_date, :due_date].each do |valid_attribute|
                        unless params[valid_attribute].blank?
                          changed_attributes[valid_attribute] = (params[valid_attribute] == 'none' ? nil : params[valid_attribute])
                        end
                      end
                      issue.init_journal(User.current)
                      call_hook(:controller_issues_move_before_save, { :params => params, :issue => issue, :target_project => @target_project, :copy => !!@copy })
                      if r = issue.move_to(@target_project, new_tracker, {:copy => @copy, :attributes => changed_attributes})
                        moved_issues << r
                      else
                        unsaved_issue_ids << issue.id
                      end
                    end
                    if unsaved_issue_ids.empty?
                      flash[:notice] = l(:notice_successful_update) unless @issues.empty?
                    else
                      flash[:error] = l(:notice_failed_to_save_issues, :count => unsaved_issue_ids.size,
                                                                       :total => @issues.size,
                                                                       :ids => '#' + unsaved_issue_ids.join(', #'))
                    end
                    if params[:follow]
                      if @issues.size == 1 && moved_issues.size == 1
                        redirect_to :controller => 'issues', :action => 'show', :id => moved_issues.first
                      else
                        redirect_to :controller => 'issues', :action => 'index', :project_id => (@target_project || @project)
                      end
                    else
                      redirect_to :controller => 'issues', :action => 'index', :project_id => @project
                    end
                    return
                  end
                  render :layout => false if request.xhr?
                end
                def destroy
                  @hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f
                  if @hours > 0
                    case params[:todo]
                    when 'destroy'
                      # nothing to do
                    when 'nullify'
                      TimeEntry.update_all('issue_id = NULL', ['issue_id IN (?)', @issues])
                    when 'reassign'
                      reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
                      if reassign_to.nil?
                        flash.now[:error] = l(:error_issue_not_found_in_project)
                        return
                      else
                        TimeEntry.update_all("issue_id = #{reassign_to.id}", ['issue_id IN (?)', @issues])
                      end
                    else
                      unless params[:format] == 'xml'
                        # display the destroy form if it's a user request
                        return
                      end
                    end
                  end
                  @issues.each(&:destroy)
                  respond_to do |format|
                    format.html { redirect_to :action => 'index', :project_id => @project }
                    format.xml  { head :ok }
                  end
                end
                def gantt
                  @gantt = Redmine::Helpers::Gantt.new(params)
                  retrieve_query
                  @query.group_by = nil
                  if @query.valid?
                    events = []
                    # Issues that have start and due dates
                    events += @query.issues(:include => [:tracker, :assigned_to, :priority],
                                            :order => "start_date, due_date",
                                            :conditions => ["(((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null)", @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to]
                                            )
                    # Issues that don't have a due date but that are assigned to a version with a date
                    events += @query.issues(:include => [:tracker, :assigned_to, :priority, :fixed_version],
                                            :order => "start_date, effective_date",
                                            :conditions => ["(((start_date>=? and start_date<=?) or (effective_date>=? and effective_date<=?) or (start_date<? and effective_date>?)) and start_date is not null and due_date is null and effective_date is not null)", @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to]
                                            )
                    # Versions
                    events += @query.versions(:conditions => ["effective_date BETWEEN ? AND ?", @gantt.date_from, @gantt.date_to])
                    @gantt.events = events
                  end
                  basename = (@project ? "#{@project.identifier}-" : '') + 'gantt'
                  respond_to do |format|
                    format.html { render :template => "issues/gantt.rhtml", :layout => !request.xhr? }
                    format.png  { send_data(@gantt.to_image, :disposition => 'inline', :type => 'image/png', :filename => "#{basename}.png") } if @gantt.respond_to?('to_image')
                    format.pdf  { send_data(gantt_to_pdf(@gantt, @project), :type => 'application/pdf', :filename => "#{basename}.pdf") }
                  end
                end
                def calendar
                  if params[:year] and params[:year].to_i > 1900
                    @year = params[:year].to_i
                    if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
                      @month = params[:month].to_i
                    end
                  end
                  @year ||= Date.today.year
                  @month ||= Date.today.month
                  @calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month)
                  retrieve_query
                  @query.group_by = nil
                  if @query.valid?
                    events = []
                    events += @query.issues(:include => [:tracker, :assigned_to, :priority],
                                            :conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
                                            )
                    events += @query.versions(:conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
                    @calendar.events = events
                  end
                  render :layout => false if request.xhr?
                end
                def context_menu
                  @issues = Issue.find_all_by_id(params[:ids], :include => :project)
                  if (@issues.size == 1)
                    @issue = @issues.first
                    @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                  end
                  projects = @issues.collect(&:project).compact.uniq
                  @project = projects.first if projects.size == 1
                  @can = {:edit => (@project && User.current.allowed_to?(:edit_issues, @project)),
                          :log_time => (@project && User.current.allowed_to?(:log_time, @project)),
                          :update => (@project && (User.current.allowed_to?(:edit_issues, @project) || (User.current.allowed_to?(:change_status, @project) && @allowed_statuses && !@allowed_statuses.empty?))),
                          :move => (@project && User.current.allowed_to?(:move_issues, @project)),
                          :copy => (@issue && @project.trackers.include?(@issue.tracker) && User.current.allowed_to?(:add_issues, @project)),
                          :delete => (@project && User.current.allowed_to?(:delete_issues, @project))
                          }
                  if @project
                    @assignables = @project.assignable_users
                    @assignables << @issue.assigned_to if @issue && @issue.assigned_to && !@assignables.include?(@issue.assigned_to)
                    @trackers = @project.trackers
                  end
                  @priorities = IssuePriority.all.reverse
                  @statuses = IssueStatus.find(:all, :order => 'position')
                  @back = params[:back_url] || request.env['HTTP_REFERER']
                  render :layout => false
                end
                def update_form
                  if params[:id].blank?
                    @issue = Issue.new
                    @issue.project = @project
                  else
                    @issue = @project.issues.visible.find(params[:id])
                  end
                  @issue.attributes = params[:issue]
                  @allowed_statuses = ([@issue.status] + @issue.status.find_new_statuses_allowed_to(User.current.roles_for_project(@project), @issue.tracker)).uniq
                  @priorities = IssuePriority.all
                  render :partial => 'attributes'
                end
                def preview
                  @issue = @project.issues.find_by_id(params[:id]) unless params[:id].blank?
                  @attachements = @issue.attachments if @issue
                  @text = params[:notes] || (params[:issue] ? params[:issue][:description] : nil)
                  render :partial => 'common/preview'
                end
              private
                def find_issue
                  @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
                  @project = @issue.project
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                # Filter for bulk operations
                def find_issues
                  @issues = Issue.find_all_by_id(params[:id] || params[:ids])
                  raise ActiveRecord::RecordNotFound if @issues.empty?
                  projects = @issues.collect(&:project).compact.uniq
                  if projects.size == 1
                    @project = projects.first
                  else
                    # TODO: let users bulk edit/move/destroy issues from different projects
                    render_error 'Can not bulk edit/move/destroy issues from different projects'
                    return false
                  end
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def find_project
                  project_id = (params[:issue] && params[:issue][:project_id]) || params[:project_id]
                  @project = Project.find(project_id)
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def find_optional_project
                  @project = Project.find(params[:project_id]) unless params[:project_id].blank?
                  allowed = User.current.allowed_to?({:controller => params[:controller], :action => params[:action]}, @project, :global => true)
                  allowed ? true : deny_access
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                # Retrieve query from session or build a new query
                def retrieve_query
                  if !params[:query_id].blank?
                    cond = "project_id IS NULL"
                    cond << " OR project_id = #{@project.id}" if @project
                    @query = Query.find(params[:query_id], :conditions => cond)
                    @query.project = @project
                    session[:query] = {:id => @query.id, :project_id => @query.project_id}
                    sort_clear
                  else
                    if api_request? || params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil)
                      # Give it a name, required to be valid
                      @query = Query.new(:name => "_")
                      @query.project = @project
                      if params[:fields] and params[:fields].is_a? Array
                        params[:fields].each do |field|
                          @query.add_filter(field, params[:operators][field], params[:values][field])
                        end
                      else
                        @query.available_filters.keys.each do |field|
                          @query.add_short_filter(field, params[field]) if params[field]
                        end
                      end
                      @query.group_by = params[:group_by]
                      @query.column_names = params[:query] && params[:query][:column_names]
                      session[:query] = {:project_id => @query.project_id, :filters => @query.filters, :group_by => @query.group_by, :column_names => @query.column_names}
                    else
                      @query = Query.find_by_id(session[:query][:id]) if session[:query][:id]
                      @query ||= Query.new(:name => "_", :project => @project, :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names])
                      @query.project = @project
                    end
                  end
                end
                # Rescues an invalid query statement. Just in case...
                def query_statement_invalid(exception)
                  logger.error "Query::StatementInvalid: #{exception.message}" if logger
                  session.delete(:query)
                  sort_clear
                  render_error "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator."
                end
                # Used by #edit and #update to set some common instance variables
                # from the params
                # TODO: Refactor, not everything in here is needed by #edit
                def update_issue_from_params
                  @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                  @priorities = IssuePriority.all
                  @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                  @time_entry = TimeEntry.new
                  @notes = params[:notes]
                  @journal = @issue.init_journal(User.current, @notes)
                  # User can change issue attributes only if he has :edit permission or if a workflow transition is allowed
                  if (@edit_allowed || !@allowed_statuses.empty?) && params[:issue]
                    attrs = params[:issue].dup
                    attrs.delete_if {|k,v| !UPDATABLE_ATTRS_ON_TRANSITION.include?(k) } unless @edit_allowed
                    attrs.delete(:status_id) unless @allowed_statuses.detect {|s| s.id.to_s == attrs[:status_id].to_s}
                    @issue.safe_attributes = attrs
                  end
                end
                # TODO: Temporary utility method for #update.  Should be split off
                # and moved to the Issue model (accepts_nested_attributes_for maybe?)
                def issue_update
                  if params[:time_entry] && params[:time_entry][:hours].present? && User.current.allowed_to?(:log_time, @project)
                    @time_entry = TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
                    @time_entry.attributes = params[:time_entry]
                    @issue.time_entries << @time_entry
                  end
                  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
                      if !@journal.new_record?
                        # Only send notification if something was actually changed
                        flash[:notice] = l(:notice_successful_update)
                      end
                      call_hook(:controller_issues_edit_after_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => @journal})
                      return true
                    end
                  end
                  # failure, returns false
                end
              end

app/controllers/messages_controller.rb +3 -3

              # redMine - project management software
              # Copyright (C) 2006-2007  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              class MessagesController < ApplicationController
                menu_item :boards
                default_search_scope :messages
                before_filter :find_board, :only => [:new, :preview]
                before_filter :find_message, :except => [:new, :preview]
                before_filter :authorize, :except => [:preview, :edit, :destroy]
                verify :method => :post, :only => [ :reply, :destroy ], :redirect_to => { :action => :show }
                verify :xhr => true, :only => :quote
                helper :watchers
                helper :attachments
                include AttachmentsHelper
                REPLIES_PER_PAGE = 25 unless const_defined?(:REPLIES_PER_PAGE)
                # Show a topic and its replies
                def show
                  page = params[:page]
                  # Find the page of the requested reply
                  if params[:r] && page.nil?
                    offset = @topic.children.count(:conditions => ["#{Message.table_name}.id < ?", params[:r].to_i])
                    page = 1 + offset / REPLIES_PER_PAGE
                  end
                  @reply_count = @topic.children.count
                  @reply_pages = Paginator.new self, @reply_count, REPLIES_PER_PAGE, page
                  @replies =  @topic.children.find(:all, :include => [:author, :attachments, {:board => :project}],
                                                         :order => "#{Message.table_name}.created_on ASC",
                                                         :limit => @reply_pages.items_per_page,
                                                         :offset => @reply_pages.current.offset)
                  @reply = Message.new(:subject => "RE: #{@message.subject}")
                  render :action => "show", :layout => false if request.xhr?
                end
                # Create a new topic
                def new
                  @message = Message.new(params[:message])
                  @message.author = User.current
                  @message.board = @board
                  if params[:message] && User.current.allowed_to?(:edit_messages, @project)
                    @message.locked = params[:message]['locked']
                    @message.sticky = params[:message]['sticky']
                  end
                  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
                # Reply to a topic
                def reply
                  @reply = Message.new(params[:reply])
                  @reply.author = User.current
                  @reply.board = @board
                  @topic.children << @reply
                  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
                # Edit a message
                def edit
                  (render_403; return false) unless @message.editable_by?(User.current)
                  if params[:message]
                    @message.locked = params[:message]['locked']
                    @message.sticky = params[:message]['sticky']
                  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)
                  end
                end
                # Delete a messages
                def destroy
                  (render_403; return false) unless @message.destroyable_by?(User.current)
                  @message.destroy
                  redirect_to @message.parent.nil? ?
                    { :controller => 'boards', :action => 'show', :project_id => @project, :id => @board } :
                    { :action => 'show', :id => @message.parent, :r => @message }
                end
                def quote
                  user = @message.author
                  text = @message.content
                  subject = @message.subject.gsub('"', '\"')
                  subject = "RE: #{subject}" unless subject.starts_with?('RE:')
                  content = "#{ll(Setting.default_language, :text_user_wrote, user)}\\n> "
                  content << text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub('"', '\"').gsub(/(\r?\n|\r\n?)/, "\\n> ") + "\\n\\n"
                  render(:update) { |page|
                    page << "$('reply_subject').value = \"#{subject}\";"
                    page.<< "$('message_content').value = \"#{content}\";"
                    page.show 'reply'
                    page << "Form.Element.focus('message_content');"
                    page << "Element.scrollTo('reply');"
                    page << "$('message_content').scrollTop = $('message_content').scrollHeight - $('message_content').clientHeight;"
                  }
                end
                def preview
                  message = @board.messages.find_by_id(params[:id])
                  @attachements = message.attachments if message
                  @text = (params[:message] || params[:reply])[:content]
                  render :partial => 'common/preview'
                end
              private
                def find_message
                  find_board
                  @message = @board.messages.find(params[:id], :include => :parent)
                  @topic = @message.root
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def find_board
                  @board = Board.find(params[:board_id], :include => :project)
                  @project = @board.project
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
              end

app/controllers/projects_controller.rb +1 -1

              # Redmine - project management software
              # Copyright (C) 2006-2009  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              class ProjectsController < ApplicationController
                menu_item :overview
                menu_item :activity, :only => :activity
                menu_item :roadmap, :only => :roadmap
                menu_item :files, :only => [:list_files, :add_file]
                menu_item :settings, :only => :settings
                before_filter :find_project, :except => [ :index, :list, :add, :copy, :activity ]
                before_filter :find_optional_project, :only => :activity
                before_filter :authorize, :except => [ :index, :list, :add, :copy, :archive, :unarchive, :destroy, :activity ]
                before_filter :authorize_global, :only => :add
                before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
                accept_key_auth :activity
                after_filter :only => [:add, :edit, :archive, :unarchive, :destroy] do |controller|
                  if controller.request.post?
                    controller.send :expire_action, :controller => 'welcome', :action => 'robots.txt'
                  end
                end
                helper :sort
                include SortHelper
                helper :custom_fields
                include CustomFieldsHelper
                helper :issues
                helper IssuesHelper
                helper :queries
                include QueriesHelper
                helper :repositories
                include RepositoriesHelper
                include ProjectsHelper
                # Lists visible projects
                def index
                  respond_to do |format|
                    format.html {
                      @projects = Project.visible.find(:all, :order => 'lft')
                    }
                    format.xml  {
                      @projects = Project.visible.find(:all, :order => 'lft')
                    }
                    format.atom {
                      projects = Project.visible.find(:all, :order => 'created_on DESC',
                                                            :limit => Setting.feeds_limit.to_i)
                      render_feed(projects, :title => "#{Setting.app_title}: #{l(:label_project_latest)}")
                    }
                  end
                end
                # Add a new project
                def add
                  @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                  @trackers = Tracker.all
                  @project = Project.new(params[:project])
                  if request.get?
                    @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
                    @project.trackers = Tracker.all
                    @project.is_public = Setting.default_projects_public?
                    @project.enabled_module_names = Setting.default_projects_modules
                  else
                    @project.enabled_module_names = params[:enabled_modules]
                    if validate_parent_id && @project.save
                      @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
                      # Add current user as a project member if he is not admin
                      unless User.current.admin?
                        r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
                        m = Member.new(:user => User.current, :roles => [r])
                        @project.members << m
                      end
                      respond_to do |format|
                        format.html {
                          flash[:notice] = l(:notice_successful_create)
                          redirect_to :controller => 'projects', :action => 'settings', :id => @project
                        }
                        format.xml  { head :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) }
                      end
                    else
                      respond_to do |format|
                        format.html
                        format.xml  { render :xml => @project.errors, :status => :unprocessable_entity }
                      end
                    end
                  end
                end
                def copy
                  @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                  @trackers = Tracker.all
                  @root_projects = Project.find(:all,
                                                :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}",
                                                :order => 'name')
                  @source_project = Project.find(params[:id])
                  if request.get?
                    @project = Project.copy_from(@source_project)
                    if @project
                      @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
                    else
                      redirect_to :controller => 'admin', :action => 'projects'
                    end
                  else
                    @project = Project.new(params[:project])
                    @project.enabled_module_names = params[:enabled_modules]
                    if validate_parent_id && @project.copy(@source_project, :only => params[:only])
                      @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
                      flash[:notice] = l(:notice_successful_create)
                      redirect_to :controller => 'admin', :action => 'projects'
                    elsif !@project.new_record?
                      # Project was created
                      # But some objects were not copied due to validation failures
                      # (eg. issues from disabled trackers)
                      # TODO: inform about that
                      redirect_to :controller => 'admin', :action => 'projects'
                    end
                  end
                rescue ActiveRecord::RecordNotFound
                  redirect_to :controller => 'admin', :action => 'projects'
                end
                # Show @project
                def show
                  if params[:jump]
                    # try to redirect to the requested menu item
                    redirect_to_project_menu_item(@project, params[:jump]) && return
                  end
                  @users_by_role = @project.users_by_role
                  @subprojects = @project.children.visible
                  @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
                  @trackers = @project.rolled_up_trackers
                  cond = @project.project_condition(Setting.display_subprojects_issues?)
                  @open_issues_by_tracker = Issue.visible.count(:group => :tracker,
                                                          :include => [:project, :status, :tracker],
                                                          :conditions => ["(#{cond}) AND #{IssueStatus.table_name}.is_closed=?", false])
                  @total_issues_by_tracker = Issue.visible.count(:group => :tracker,
                                                          :include => [:project, :status, :tracker],
                                                          :conditions => cond)
                  TimeEntry.visible_by(User.current) do
                    @total_hours = TimeEntry.sum(:hours,
                                                 :include => :project,
                                                 :conditions => cond).to_f
                  end
                  @key = User.current.rss_key
                  respond_to do |format|
                    format.html
                    format.xml
                  end
                end
                def settings
                  @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                  @issue_category ||= IssueCategory.new
                  @member ||= @project.members.new
                  @trackers = Tracker.all
                  @repository ||= @project.repository
                  @wiki ||= @project.wiki
                end
                # Edit @project
                def edit
                  if request.get?
                  else
                    @project.attributes = params[:project]
                    if validate_parent_id && @project.save
                      @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
                      respond_to do |format|
                        format.html {
                          flash[:notice] = l(:notice_successful_update)
                          redirect_to :action => 'settings', :id => @project
                        }
                        format.xml  { head :ok }
                      end
                    else
                      respond_to do |format|
                        format.html {
                          settings
                          render :action => 'settings'
                        }
                        format.xml  { render :xml => @project.errors, :status => :unprocessable_entity }
                      end
                    end
                  end
                end
                def modules
                  @project.enabled_module_names = params[:enabled_modules]
                  redirect_to :action => 'settings', :id => @project, :tab => 'modules'
                end
                def archive
                  if request.post?
                    unless @project.archive
                      flash[:error] = l(:error_can_not_archive_project)
                    end
                  end
                  redirect_to(url_for(:controller => 'admin', :action => 'projects', :status => params[:status]))
                end
                def unarchive
                  @project.unarchive if request.post? && !@project.active?
                  redirect_to(url_for(:controller => 'admin', :action => 'projects', :status => params[:status]))
                end
                # Delete @project
                def destroy
                  @project_to_destroy = @project
                  if request.get?
                    # display confirmation view
                  else
                    if params[:format] == 'xml' || params[:confirm]
                      @project_to_destroy.destroy
                      respond_to do |format|
                        format.html { redirect_to :controller => 'admin', :action => 'projects' }
                        format.xml  { head :ok }
                      end
                    end
                  end
                  # hide project in layout
                  @project = nil
                end
                # Add a new issue category to @project
                def add_issue_category
                  @category = @project.issue_categories.build(params[:category])
                  if request.post?
                    if @category.save
                  	  respond_to do |format|
                        format.html do
                          flash[:notice] = l(:notice_successful_create)
                          redirect_to :action => 'settings', :tab => 'categories', :id => @project
                        end
                        format.js do
                          # IE doesn't support the replace_html rjs method for select box options
                          render(:update) {|page| page.replace "issue_category_id",
                            content_tag('select', '<option></option>' + options_from_collection_for_select(@project.issue_categories, 'id', 'name', @category.id), :id => 'issue_category_id', :name => 'issue[category_id]')
                          }
                        end
                      end
                    else
                      respond_to do |format|
                        format.html
                        format.js do
                          render(:update) {|page| page.alert(@category.errors.full_messages.join('\n')) }
                        end
                      end
                    end
                  end
                end
                # Add a new version to @project
                def add_version
                  @version = @project.versions.build
                  if params[:version]
                    attributes = params[:version].dup
                    attributes.delete('sharing') unless attributes.nil? || @version.allowed_sharings.include?(attributes['sharing'])
                    @version.attributes = attributes
                  end
                	if request.post?
                	  if @version.save
                      respond_to do |format|
                        format.html do
                          flash[:notice] = l(:notice_successful_create)
                          redirect_to :action => 'settings', :tab => 'versions', :id => @project
                        end
                        format.js do
                          # IE doesn't support the replace_html rjs method for select box options
                          render(:update) {|page| page.replace "issue_fixed_version_id",
                            content_tag('select', '<option></option>' + version_options_for_select(@project.shared_versions.open, @version), :id => 'issue_fixed_version_id', :name => 'issue[fixed_version_id]')
                          }
                        end
                      end
                    else
                      respond_to do |format|
                        format.html
                        format.js do
                          render(:update) {|page| page.alert(@version.errors.full_messages.join('\n')) }
                        end
                      end
                	  end
                	end
                end
                def add_file
                  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])
                    end
                    redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                    return
                  end
                  @versions = @project.versions.sort
                end
                def save_activities
                  if request.post? && params[:enumerations]
                    Project.transaction do
                      params[:enumerations].each do |id, activity|
                        @project.update_or_create_time_entry_activity(id, activity)
                      end
                    end
                  end
                  redirect_to :controller => 'projects', :action => 'settings', :tab => 'activities', :id => @project
                end
                def reset_activities
                  @project.time_entry_activities.each do |time_entry_activity|
                    time_entry_activity.destroy(time_entry_activity.parent)
                  end
                  redirect_to :controller => 'projects', :action => 'settings', :tab => 'activities', :id => @project
                end
                def list_files
                  sort_init 'filename', 'asc'
                  sort_update 'filename' => "#{Attachment.table_name}.filename",
                              'created_on' => "#{Attachment.table_name}.created_on",
                              'size' => "#{Attachment.table_name}.filesize",
                              'downloads' => "#{Attachment.table_name}.downloads"
                  @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
                def roadmap
                  @trackers = @project.trackers.find(:all, :order => 'position')
                  retrieve_selected_tracker_ids(@trackers, @trackers.select {|t| t.is_in_roadmap?})
                  @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
                  project_ids = @with_subprojects ? @project.self_and_descendants.collect(&:id) : [@project.id]
                  @versions = @project.shared_versions.sort
                  @versions.reject! {|version| version.closed? || version.completed? } unless params[:completed]
                  @issues_by_version = {}
                  unless @selected_tracker_ids.empty?
                    @versions.each do |version|
                      issues = version.fixed_issues.visible.find(:all,
                                                                 :include => [:project, :status, :tracker, :priority],
                                                                 :conditions => {:tracker_id => @selected_tracker_ids, :project_id => project_ids},
                                                                 :order => "#{Project.table_name}.lft, #{Tracker.table_name}.position, #{Issue.table_name}.id")
                      @issues_by_version[version] = issues
                    end
                  end
                  @versions.reject! {|version| !project_ids.include?(version.project_id) && @issues_by_version[version].empty?}
                end
                def activity
                  @days = Setting.activity_days_default.to_i
                  if params[:from]
                    begin; @date_to = params[:from].to_date + 1; rescue; end
                  end
                  @date_to ||= Date.today + 1
                  @date_from = @date_to - @days
                  @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
                  @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
                  @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project,
                                                                           :with_subprojects => @with_subprojects,
                                                                           :author => @author)
                  @activity.scope_select {|t| !params["show_#{t}"].nil?}
                  @activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?
                  events = @activity.events(@date_from, @date_to)
                  if events.empty? || stale?(:etag => [events.first, User.current])
                    respond_to do |format|
                      format.html {
                        @events_by_day = events.group_by(&:event_date)
                        render :layout => false if request.xhr?
                      }
                      format.atom {
                        title = l(:label_activity)
                        if @author
                          title = @author.name
                        elsif @activity.scope.size == 1
                          title = l("label_#{@activity.scope.first.singularize}_plural")
                        end
                        render_feed(events, :title => "#{@project || Setting.app_title}: #{title}")
                      }
                    end
                  end
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
              private
                def find_optional_project
                  return true unless params[:id]
                  @project = Project.find(params[:id])
                  authorize
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def retrieve_selected_tracker_ids(selectable_trackers, default_trackers=nil)
                  if ids = params[:tracker_ids]
                    @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
                  else
                    @selected_tracker_ids = (default_trackers || selectable_trackers).collect {|t| t.id.to_s }
                  end
                end
                # Validates parent_id param according to user's permissions
                # TODO: move it to Project model in a validation that depends on User.current
                def validate_parent_id
                  return true if User.current.admin?
                  parent_id = params[:project] && params[:project][:parent_id]
                  if parent_id || @project.new_record?
                    parent = parent_id.blank? ? nil : Project.find_by_id(parent_id.to_i)
                    unless @project.allowed_parents.include?(parent)
                      @project.errors.add :parent_id, :invalid
                      return false
                    end
                  end
                  true
                end
              end

app/controllers/wiki_controller.rb +3 -3

              # redMine - project management software
              # Copyright (C) 2006-2007  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              require 'diff'
              class WikiController < ApplicationController
                default_search_scope :wiki_pages
                before_filter :find_wiki, :authorize
                before_filter :find_existing_page, :only => [:rename, :protect, :history, :diff, :annotate, :add_attachment, :destroy]
                verify :method => :post, :only => [:destroy, :protect], :redirect_to => { :action => :index }
                helper :attachments
                include AttachmentsHelper
                helper :watchers
                # display a page (in editing mode if it doesn't exist)
                def index
                  page_title = params[:page]
                  @page = @wiki.find_or_new_page(page_title)
                  if @page.new_record?
                    if User.current.allowed_to?(:edit_wiki_pages, @project)
                      edit
                      render :action => 'edit'
                    else
                      render_404
                    end
                    return
                  end
                  if params[:version] && !User.current.allowed_to?(:view_wiki_edits, @project)
                    # Redirects user to the current version if he's not allowed to view previous versions
                    redirect_to :version => nil
                    return
                  end
                  @content = @page.content_for_version(params[:version])
                  if User.current.allowed_to?(:export_wiki_pages, @project)
                    if params[:format] == 'html'
                      export = render_to_string :action => 'export', :layout => false
                      send_data(export, :type => 'text/html', :filename => "#{@page.title}.html")
                      return
                    elsif params[:format] == 'txt'
                      send_data(@content.text, :type => 'text/plain', :filename => "#{@page.title}.txt")
                      return
                    end
                  end
                  @editable = editable?
                  render :action => 'show'
                end
                # edit an existing page or a new one
                def edit
                  @page = @wiki.find_or_new_page(params[:page])
                  return render_403 unless editable?
                  @page.content = WikiContent.new(:page => @page) if @page.new_record?
                  @content = @page.content_for_version(params[:version])
                  @content.text = initial_page_content(@page) if @content.text.blank?
                  # don't keep previous comment
                  @content.comments = nil
                  if request.get?
                    # To prevent StaleObjectError exception when reverting to a previous version
                    @content.version = @page.content.version
                  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
                    end
                    #@content.text = params[:content][:text]
                    #@content.comments = params[:content][:comments]
                    @content.attributes = params[:content]
                    @content.author = User.current
                    # 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
                  end
                rescue ActiveRecord::StaleObjectError
                  # Optimistic locking exception
                  flash[:error] = l(:notice_locking_conflict)
                end
                # rename a page
                def rename
                  return render_403 unless editable?
                  @page.redirect_existing_links = true
                  # used to display the *original* title if some AR validation errors occur
                  @original_title = @page.pretty_title
                  if request.post? && @page.update_attributes(params[:wiki_page])
                    flash[:notice] = l(:notice_successful_update)
                    redirect_to :action => 'index', :id => @project, :page => @page.title
                  end
                end
                def protect
                  @page.update_attribute :protected, params[:protected]
                  redirect_to :action => 'index', :id => @project, :page => @page.title
                end
                # show page history
                def history
                  @version_count = @page.content.versions.count
                  @version_pages = Paginator.new self, @version_count, per_page_option, params['p']
                  # don't load text
                  @versions = @page.content.versions.find :all,
                                                          :select => "id, author_id, comments, updated_on, version",
                                                          :order => 'version DESC',
                                                          :limit  =>  @version_pages.items_per_page + 1,
                                                          :offset =>  @version_pages.current.offset
                  render :layout => false if request.xhr?
                end
                def diff
                  @diff = @page.diff(params[:version], params[:version_from])
                  render_404 unless @diff
                end
                def annotate
                  @annotate = @page.annotate(params[:version])
                  render_404 unless @annotate
                end
                # Removes a wiki page and its history
                # Children can be either set as root pages, removed or reassigned to another parent page
                def destroy
                  return render_403 unless editable?
                  @descendants_count = @page.descendants.size
                  if @descendants_count > 0
                    case params[:todo]
                    when 'nullify'
                      # Nothing to do
                    when 'destroy'
                      # Removes all its descendants
                      @page.descendants.each(&:destroy)
                    when 'reassign'
                      # Reassign children to another parent page
                      reassign_to = @wiki.pages.find_by_id(params[:reassign_to_id].to_i)
                      return unless reassign_to
                      @page.children.each do |child|
                        child.update_attribute(:parent, reassign_to)
                      end
                    else
                      @reassignable_to = @wiki.pages - @page.self_and_descendants
                      return
                    end
                  end
                  @page.destroy
                  redirect_to :action => 'special', :id => @project, :page => 'Page_index'
                end
                # display special pages
                def special
                  page_title = params[:page].downcase
                  case page_title
                  # show pages index, sorted by title
                  when 'page_index', 'date_index'
                    # eager load information about last updates, without loading text
                    @pages = @wiki.pages.find :all, :select => "#{WikiPage.table_name}.*, #{WikiContent.table_name}.updated_on",
                                                    :joins => "LEFT JOIN #{WikiContent.table_name} ON #{WikiContent.table_name}.page_id = #{WikiPage.table_name}.id",
                                                    :order => 'title'
                    @pages_by_date = @pages.group_by {|p| p.updated_on.to_date}
                    @pages_by_parent_id = @pages.group_by(&:parent_id)
                  # export wiki to a single html file
                  when 'export'
                    if User.current.allowed_to?(:export_wiki_pages, @project)
                      @pages = @wiki.pages.find :all, :order => 'title'
                      export = render_to_string :action => 'export_multiple', :layout => false
                      send_data(export, :type => 'text/html', :filename => "wiki.html")
                    else
                      redirect_to :action => 'index', :id => @project, :page => nil
                    end
                    return
                  else
                    # requested special page doesn't exist, redirect to default page
                    redirect_to :action => 'index', :id => @project, :page => nil
                    return
                  end
                  render :action => "special_#{page_title}"
                end
                def preview
                  page = @wiki.find_page(params[:page])
                  # page is nil when previewing a new page
                  return render_403 unless page.nil? || editable?(page)
                  if page
                    @attachements = page.attachments
                    @previewed = page.content
                  end
                  @text = params[:content][:text]
                  render :partial => 'common/preview'
                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
              private
                def find_wiki
                  @project = Project.find(params[:id])
                  @wiki = @project.wiki
                  render_404 unless @wiki
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                # Finds the requested page and returns a 404 error if it doesn't exist
                def find_existing_page
                  @page = @wiki.find_page(params[:page])
                  render_404 if @page.nil?
                end
                # Returns true if the current user is allowed to edit the page, otherwise false
                def editable?(page = @page)
                  page.editable_by?(User.current)
                end
                # Returns the default content of a new wiki page
                def initial_page_content(page)
                  helper = Redmine::WikiFormatting.helper_for(Setting.text_formatting)
                  extend helper unless self.instance_of?(helper)
                  helper.instance_method(:initial_page_content).bind(self).call(page)
                end
              end

app/models/attachment.rb +2 -7

              # redMine - project management software
              # Copyright (C) 2006-2007  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              require "digest/md5"
              class Attachment < ActiveRecord::Base
                belongs_to :container, :polymorphic => true
                belongs_to :author, :class_name => "User", :foreign_key => "author_id"
                validates_presence_of :container, :filename, :author
                validates_length_of :filename, :maximum => 255
                validates_length_of :disk_filename, :maximum => 255
                acts_as_event :title => :filename,
                              :url => Proc.new {|o| {:controller => 'attachments', :action => 'download', :id => o.id, :filename => o.filename}}
                acts_as_activity_provider :type => 'files',
                                          :permission => :view_files,
                                          :author_key => :author_id,
                                          :find_options => {:select => "#{Attachment.table_name}.*",
                                                            :joins => "LEFT JOIN #{Version.table_name} ON #{Attachment.table_name}.container_type='Version' AND #{Version.table_name}.id = #{Attachment.table_name}.container_id " +
                                                                      "LEFT JOIN #{Project.table_name} ON #{Version.table_name}.project_id = #{Project.table_name}.id OR ( #{Attachment.table_name}.container_type='Project' AND #{Attachment.table_name}.container_id = #{Project.table_name}.id )"}
                acts_as_activity_provider :type => 'documents',
                                          :permission => :view_documents,
                                          :author_key => :author_id,
                                          :find_options => {:select => "#{Attachment.table_name}.*",
                                                            :joins => "LEFT JOIN #{Document.table_name} ON #{Attachment.table_name}.container_type='Document' AND #{Document.table_name}.id = #{Attachment.table_name}.container_id " +
                                                                      "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"}
                cattr_accessor :storage_path
                @@storage_path = "#{RAILS_ROOT}/files"
                def validate
                  if self.filesize > Setting.attachment_max_size.to_i.kilobytes
                    errors.add(:base, :too_long, :count => Setting.attachment_max_size.to_i.kilobytes)
                  end
                end
                def file=(incoming_file)
                  unless incoming_file.nil?
                    @temp_file = incoming_file
                    if @temp_file.size > 0
                      self.filename = sanitize_filename(@temp_file.original_filename)
                      self.disk_filename = Attachment.disk_filename(filename)
                      self.content_type = @temp_file.content_type.to_s.chomp
                      if content_type.blank?
                        self.content_type = Redmine::MimeType.of(filename)
                      end
                      self.filesize = @temp_file.size
                    end
                  end
                end
                def file
                  nil
                end
                # Copies the temporary file to its final location
                # and computes its MD5 hash
                def before_save
                  if @temp_file && (@temp_file.size > 0)
                    logger.debug("saving '#{self.diskfile}'")
                    md5 = Digest::MD5.new
                    File.open(diskfile, "wb") do |f|
                      buffer = ""
                      while (buffer = @temp_file.read(8192))
                        f.write(buffer)
                        md5.update(buffer)
                      end
                    end
                    self.digest = md5.hexdigest
                  end
                  # Don't save the content type if it's longer than the authorized length
                  if self.content_type && self.content_type.length > 255
                    self.content_type = nil
                  end
                end
                # Deletes file on the disk
                def after_destroy
                  File.delete(diskfile) if !filename.blank? && File.exist?(diskfile)
                end
                # Returns file's location on disk
                def diskfile
                  "#{@@storage_path}/#{self.disk_filename}"
                end
                def increment_download
                  increment!(:downloads)
                end
                def project
                  container.project
                end
                def visible?(user=User.current)
                  container.attachments_visible?(user)
                end
                def deletable?(user=User.current)
                  container.attachments_deletable?(user)
                end
                def image?
                  self.filename =~ /\.(jpe?g|gif|png)$/i
                end
                def is_text?
                  Redmine::MimeType.is_type?('text', filename)
                end
                def is_diff?
                  self.filename =~ /\.(patch|diff)$/i
                end
                # Returns true if the file is readable
                def readable?
                  File.readable?(diskfile)
                end
                # Bulk attaches a set of files to an object
                #
                # 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']
                      next unless file && file.size > 0
                      a = Attachment.create(:container => obj,
                                            :file => file,
                                            :description => attachment['description'].to_s.strip,
                                            :author => User.current)
-                     a.new_record? ? (unsaved << a) : (attached << a)
-                   end
-                   if unsaved.any?
-                     flash = l(:warning_attachments_not_saved, unsaved.size)
+                     a.new_record? ? (obj.unsaved_attachments << a) : (attached << a)
                    end
                  end
-                 {:files => attached, :flash => flash, :unsaved => unsaved}
+                 {:files => attached, :unsaved => obj.unsaved_attachments}
                end
              private
                def sanitize_filename(value)
                  # get only the filename, not the whole path
                  just_filename = value.gsub(/^.*(\\|\/)/, '')
                  # NOTE: File.basename doesn't work right with Windows paths on Unix
                  # INCORRECT: just_filename = File.basename(value.gsub('\\\\', '/'))
                  # Finally, replace all non alphanumeric, hyphens or periods with underscore
                  @filename = just_filename.gsub(/[^\w\.\-]/,'_')
                end
                # Returns an ASCII or hashed filename
                def self.disk_filename(filename)
                  timestamp = DateTime.now.strftime("%y%m%d%H%M%S")
                  ascii = ''
                  if filename =~ %r{^[a-zA-Z0-9_\.\-]*$}
                    ascii = filename
                  else
                    ascii = Digest::MD5.hexdigest(filename)
                    # keep the extension if any
                    ascii << $1 if filename =~ %r{(\.[a-zA-Z0-9]+)$}
                  end
                  while File.exist?(File.join(@@storage_path, "#{timestamp}_#{ascii}"))
                    timestamp.succ!
                  end
                  "#{timestamp}_#{ascii}"
                end
              end

vendor/plugins/acts_as_attachable/lib/acts_as_attachable.rb +7 -1

              # Redmine - project management software
              # Copyright (C) 2006-2008  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              module Redmine
                module Acts
                  module Attachable
                    def self.included(base)
                      base.extend ClassMethods
                    end
                    module ClassMethods
                      def acts_as_attachable(options = {})
                        cattr_accessor :attachable_options
                        self.attachable_options = {}
                        attachable_options[:view_permission] = options.delete(:view_permission) || "view_#{self.name.pluralize.underscore}".to_sym
                        attachable_options[:delete_permission] = options.delete(:delete_permission) || "edit_#{self.name.pluralize.underscore}".to_sym
                        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
                    module InstanceMethods
                      def self.included(base)
                        base.extend ClassMethods
                      end
                      def attachments_visible?(user=User.current)
                        user.allowed_to?(self.class.attachable_options[:view_permission], self.project)
                      end
                      def attachments_deletable?(user=User.current)
                        user.allowed_to?(self.class.attachable_options[:delete_permission], self.project)
                      end
+                     def initialize_unsaved_attachments
+                       @unsaved_attachments ||= []
+                     end
                      module ClassMethods
                      end
                    end
                  end
                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