jro_apps/redmine Commit - r1066:44ac1a0debc8

ProjectsController#add_issue moved to IssuesController#new....

Jean-Philippe Lang -

r1066:44ac1a0debc8

parent child

Context file:

r1066:44ac1a0debc8

Collapse all files

app/controllers/issues_controller.rb +61 -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 IssuesController < ApplicationController
               layout 'base'
-              before_filter :find_project, :authorize, :except => [:index, :changes, :preview]
+              before_filter :find_issue, :except => [:index, :changes, :preview, :new, :update_form]
+              before_filter :find_project, :only => [:new, :update_form]
+              before_filter :authorize, :except => [:index, :changes, :preview, :update_form]
               before_filter :find_optional_project, :only => [:index, :changes]
               accept_key_auth :index, :changes
-              cache_sweeper :issue_sweeper, :only => [ :edit, :update, :destroy ]
+              cache_sweeper :issue_sweeper, :only => [ :new, :edit, :update, :destroy ]
               helper :projects
               include ProjectsHelper
               helper :custom_fields
               include CustomFieldsHelper
               helper :ifpdf
               include IfpdfHelper
               helper :issue_relations
               include IssueRelationsHelper
               helper :watchers
               include WatchersHelper
               helper :attachments
               include AttachmentsHelper
               helper :queries
               helper :sort
               include SortHelper
               include IssuesHelper
               def index
                 sort_init "#{Issue.table_name}.id", "desc"
                 sort_update
                 retrieve_query
                 if @query.valid?
                   limit = %w(pdf csv).include?(params[:format]) ? Setting.issues_export_limit.to_i : per_page_option
                   @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)
                   @issue_pages = Paginator.new self, @issue_count, limit, params['page']
                   @issues = Issue.find :all, :order => sort_clause,
                                        :include => [ :assigned_to, :status, :tracker, :project, :priority, :category, :fixed_version ],
                                        :conditions => @query.statement,
                                        :limit  =>  limit,
                                        :offset =>  @issue_pages.current.offset
                   respond_to do |format|
                     format.html { render :template => 'issues/index.rhtml', :layout => !request.xhr? }
                     format.atom { render_feed(@issues, :title => l(:label_issue_plural)) }
                     format.csv  { send_data(issues_to_csv(@issues, @project).read, :type => 'text/csv; header=present', :filename => 'export.csv') }
                     format.pdf  { send_data(render(:template => 'issues/index.rfpdf', :layout => false), :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
               end
               def changes
                 sort_init "#{Issue.table_name}.id", "desc"
                 sort_update
                 retrieve_query
                 if @query.valid?
                   @changes = Journal.find :all, :include => [ :details, :user, {:issue => [:project, :author, :tracker, :status]} ],
                                                  :conditions => @query.statement,
                                                  :limit => 25,
                                                  :order => "#{Journal.table_name}.created_on DESC"
                 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'
               end
               def show
                 @custom_values = @issue.custom_values.find(:all, :include => :custom_field, :order => "#{CustomField.table_name}.position")
                 @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
                 @status_options = @issue.new_statuses_allowed_to(User.current)
                 @activities = Enumeration::get_values('ACTI')
                 respond_to do |format|
                   format.html { render :template => 'issues/show.rhtml' }
                   format.pdf  { send_data(render(:template => 'issues/show.rfpdf', :layout => false), :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 = params[:copy_from] ? Issue.new.copy_from(params[:copy_from]) : Issue.new(params[:issue])
+                @issue.project = @project
+                @issue.author = User.current
+                @issue.tracker ||= @project.trackers.find(params[:tracker_id] ? params[:tracker_id] : :first)
+                if @issue.tracker.nil?
+                  flash.now[:error] = 'No tracker is associated to this project. Please check the Project settings.'
+                  render :nothing => true, :layout => true
+                  return
+                end
+                default_status = IssueStatus.default
+                unless default_status
+                  flash.now[:error] = 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'
+                  render :nothing => true, :layout => true
+                  return
+                end
+                @issue.status = default_status
+                @allowed_statuses = ([default_status] + default_status.find_new_statuses_allowed_to(User.current.role_for_project(@project), @issue.tracker))
+                if request.get? || request.xhr?
+                  @issue.start_date ||= Date.today
+                  @custom_values = @issue.custom_values.empty? ?
+                    @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) } :
+                    @issue.custom_values
+                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
+                  @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
+                  @issue.custom_values = @custom_values
+                  if @issue.save
+                    attach_files(@issue, params[:attachments])
+                    flash[:notice] = l(:notice_successful_create)
+                    Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
+                    redirect_to :controller => 'issues', :action => 'index', :project_id => @project
+                    return
+                  end
+                end
+                @priorities = Enumeration::get_values('IPRI')
+                render :layout => !request.xhr?
+              end
               def edit
                 @priorities = Enumeration::get_values('IPRI')
                 @custom_values = []
                 if request.get?
                   @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
                 else
                   begin
                     journal = @issue.init_journal(User.current)
                     # Retrieve custom fields and values
                     if params["custom_fields"]
                       @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
                       @issue.custom_values = @custom_values
                     end
                     @issue.attributes = params[:issue]
                     if @issue.save
                       flash[:notice] = l(:notice_successful_update)
                       Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
                       redirect_to(params[:back_to] || {:action => 'show', :id => @issue})
                     end
                   rescue ActiveRecord::StaleObjectError
                     # Optimistic locking exception
                     flash[:error] = l(:notice_locking_conflict)
                   end
                 end
               end
               # Attributes that can be updated on workflow transition
               # 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 update
                 @status_options = @issue.new_statuses_allowed_to(User.current)
                 @activities = Enumeration::get_values('ACTI')
                 journal = @issue.init_journal(User.current, params[:notes])
                 # User can change issue attributes only if a workflow transition is allowed
                 if !@status_options.empty? && params[:issue]
                   attrs = params[:issue].dup
                   attrs.delete_if {|k,v| !UPDATABLE_ATTRS_ON_TRANSITION.include?(k) }
                   attrs.delete(:status_id) unless @status_options.detect {|s| s.id.to_s == attrs[:status_id].to_s}
                   @issue.attributes = attrs
                 end
                 if request.post?
                   attachments = attach_files(@issue, params[:attachments])
                   attachments.each {|a| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
                   if @issue.save
                     # Log spend time
                     if current_role.allowed_to?(:log_time)
                       @time_entry = TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
                       @time_entry.attributes = params[:time_entry]
                       @time_entry.save
                     end
                     if !journal.new_record?
                       # Only send notification if something was actually changed
                       flash[:notice] = l(:notice_successful_update)
                       Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
                     end
                     redirect_to(params[:back_to] || {:action => 'show', :id => @issue})
                   end
                 end
               rescue ActiveRecord::StaleObjectError
                 # Optimistic locking exception
                 flash.now[:error] = l(:notice_locking_conflict)
               end
               def destroy
                 @issue.destroy
                 redirect_to :action => 'index', :project_id => @project
               end
               def destroy_attachment
                 a = @issue.attachments.find(params[:attachment_id])
                 a.destroy
                 journal = @issue.init_journal(User.current)
                 journal.details << JournalDetail.new(:property => 'attachment',
                                                      :prop_key => a.id,
                                                      :old_value => a.filename)
                 journal.save
                 redirect_to :action => 'show', :id => @issue
               end
               def context_menu
                 @priorities = Enumeration.get_values('IPRI').reverse
                 @statuses = IssueStatus.find(:all, :order => 'position')
                 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                 @assignables = @issue.assignable_users
                 @assignables << @issue.assigned_to if @issue.assigned_to && !@assignables.include?(@issue.assigned_to)
                 @can = {:edit => User.current.allowed_to?(:edit_issues, @project),
                         :assign => (@allowed_statuses.any? || User.current.allowed_to?(:edit_issues, @project)),
                         :add => User.current.allowed_to?(:add_issues, @project),
                         :move => User.current.allowed_to?(:move_issues, @project),
                         :copy => (@project.trackers.include?(@issue.tracker) && User.current.allowed_to?(:add_issues, @project)),
                         :delete => User.current.allowed_to?(:delete_issues, @project)}
                 render :layout => false
               end
+              def update_form
+                @issue = Issue.new(params[:issue])
+                render :action => :new, :layout => false
+              end
               def preview
                 issue = Issue.find_by_id(params[:id])
                 @attachements = issue.attachments if issue
                 @text = params[:issue][:description]
                 render :partial => 'common/preview'
               end
             private
-              def find_project
+              def find_issue
                 @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
                 @project = @issue.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
+              def find_project
+                @project = Project.find(params[:project_id])
+              rescue ActiveRecord::RecordNotFound
+                render_404
+              end
               def find_optional_project
                 return true unless params[:project_id]
                 @project = Project.find(params[:project_id])
                 authorize
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # Retrieve query from session or build a new query
               def retrieve_query
                 if params[:query_id]
                   @query = Query.find(params[:query_id], :conditions => {:project_id => (@project ? @project.id : nil)})
                   session[:query] = {:id => @query.id, :project_id => @query.project_id}
                 else
                   if 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
                     session[:query] = {:project_id => @query.project_id, :filters => @query.filters}
                   else
                     @query = Query.find_by_id(session[:query][:id]) if session[:query][:id]
                     @query ||= Query.new(:name => "_", :project => @project, :filters => session[:query][:filters])
                   end
                 end
               end
             end

app/controllers/projects_controller.rb +1 -41

             # 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 ProjectsController < ApplicationController
               layout 'base'
               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
-              menu_item :issues, :only => [:add_issue, :bulk_edit_issues, :changelog, :move_issues]
+              menu_item :issues, :only => [:bulk_edit_issues, :changelog, :move_issues]
               before_filter :find_project, :except => [ :index, :list, :add ]
               before_filter :authorize, :except => [ :index, :list, :add, :archive, :unarchive, :destroy ]
               before_filter :require_admin, :only => [ :add, :archive, :unarchive, :destroy ]
               accept_key_auth :activity, :calendar
               cache_sweeper :project_sweeper, :only => [ :add, :edit, :archive, :unarchive, :destroy ]
-              cache_sweeper :issue_sweeper, :only => [ :add_issue ]
               cache_sweeper :version_sweeper, :only => [ :add_version ]
               helper :sort
               include SortHelper
               helper :custom_fields
               include CustomFieldsHelper
               helper :ifpdf
               include IfpdfHelper
               helper :issues
               helper IssuesHelper
               helper :queries
               include QueriesHelper
               helper :repositories
               include RepositoriesHelper
               include ProjectsHelper
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               # Lists visible projects
               def list
                 projects = Project.find :all,
                                         :conditions => Project.visible_by(User.current),
                                         :include => :parent
                 @project_tree = projects.group_by {|p| p.parent || p}
                 @project_tree.each_key {|p| @project_tree[p] -= [p]}
               end
               # Add a new project
               def add
                 @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')
                 @project = Project.new(params[:project])
                 @project.enabled_module_names = Redmine::AccessControl.available_project_modules
                 if request.get?
                   @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project) }
                   @project.trackers = Tracker.all
                 else
                   @project.custom_fields = CustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
                   @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => (params[:custom_fields] ? params["custom_fields"][x.id.to_s] : nil)) }
                   @project.custom_values = @custom_values
                   if @project.save
                     @project.enabled_module_names = params[:enabled_modules]
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :controller => 'admin', :action => 'projects'
             	  end
                 end
               end
               # Show @project
               def show
                 @custom_values = @project.custom_values.find(:all, :include => :custom_field, :order => "#{CustomField.table_name}.position")
                 @members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
                 @subprojects = @project.active_children
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
                 @trackers = @project.trackers
                 @open_issues_by_tracker = Issue.count(:group => :tracker, :joins => "INNER JOIN #{IssueStatus.table_name} ON #{IssueStatus.table_name}.id = #{Issue.table_name}.status_id", :conditions => ["project_id=? and #{IssueStatus.table_name}.is_closed=?", @project.id, false])
                 @total_issues_by_tracker = Issue.count(:group => :tracker, :conditions => ["project_id=?", @project.id])
                 @total_hours = @project.time_entries.sum(:hours)
                 @key = User.current.rss_key
               end
               def settings
                 @root_projects = Project.find(:all,
                                               :conditions => ["parent_id IS NULL AND status = #{Project::STATUS_ACTIVE} AND id <> ?", @project.id],
                                               :order => 'name')
                 @custom_fields = IssueCustomField.find(:all)
                 @issue_category ||= IssueCategory.new
                 @member ||= @project.members.new
                 @trackers = Tracker.all
                 @custom_values ||= ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| @project.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
                 @repository ||= @project.repository
                 @wiki ||= @project.wiki
               end
               # Edit @project
               def edit
                 if request.post?
                   @project.custom_fields = IssueCustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
                   if params[:custom_fields]
                     @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
                     @project.custom_values = @custom_values
                   end
                   @project.attributes = params[:project]
                   if @project.save
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               def modules
                 @project.enabled_module_names = params[:enabled_modules]
                 redirect_to :action => 'settings', :id => @project, :tab => 'modules'
               end
               def archive
                 @project.archive if request.post? && @project.active?
                 redirect_to :controller => 'admin', :action => 'projects'
               end
               def unarchive
                 @project.unarchive if request.post? && !@project.active?
                 redirect_to :controller => 'admin', :action => 'projects'
               end
               # Delete @project
               def destroy
                 @project_to_destroy = @project
                 if request.post? and params[:confirm]
                   @project_to_destroy.destroy
                   redirect_to :controller => 'admin', :action => 'projects'
                 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? and @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
                 end
               end
               # Add a new version to @project
               def add_version
               	@version = @project.versions.build(params[:version])
               	if request.post? and @version.save
               	  flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'settings', :tab => 'versions', :id => @project
               	end
               end
-              # Add a new issue to @project
-              # The new issue will be created from an existing one if copy_from parameter is given
-              def add_issue
-                @issue = params[:copy_from] ? Issue.new.copy_from(params[:copy_from]) : Issue.new(params[:issue])
-                @issue.project = @project
-                @issue.author = User.current
-                @issue.tracker ||= @project.trackers.find(params[:tracker_id])
-                default_status = IssueStatus.default
-                unless default_status
-                  flash.now[:error] = 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'
-                  render :nothing => true, :layout => true
-                  return
-                end
-                @issue.status = default_status
-                @allowed_statuses = ([default_status] + default_status.find_new_statuses_allowed_to(User.current.role_for_project(@project), @issue.tracker))
-                if request.get?
-                  @issue.start_date ||= Date.today
-                  @custom_values = @issue.custom_values.empty? ?
-                    @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) } :
-                    @issue.custom_values
-                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
-                  @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
-                  @issue.custom_values = @custom_values
-                  if @issue.save
-                    attach_files(@issue, params[:attachments])
-                    flash[:notice] = l(:notice_successful_create)
-                    Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
-                    redirect_to :controller => 'issues', :action => 'index', :project_id => @project
-                    return
-                  end
-                end
-                @priorities = Enumeration::get_values('IPRI')
-              end
               # Bulk edit issues
               def bulk_edit_issues
                 if request.post?
                   status = params[:status_id].blank? ? nil : IssueStatus.find_by_id(params[:status_id])
                   priority = params[:priority_id].blank? ? nil : Enumeration.find_by_id(params[:priority_id])
                   assigned_to = params[:assigned_to_id].blank? ? nil : User.find_by_id(params[:assigned_to_id])
                   category = params[:category_id].blank? ? nil : @project.issue_categories.find_by_id(params[:category_id])
                   fixed_version = params[:fixed_version_id].blank? ? nil : @project.versions.find_by_id(params[:fixed_version_id])
                   issues = @project.issues.find_all_by_id(params[:issue_ids])
                   unsaved_issue_ids = []
                   issues.each do |issue|
                     journal = issue.init_journal(User.current, params[:notes])
                     issue.priority = priority if priority
                     issue.assigned_to = assigned_to if assigned_to || params[:assigned_to_id] == 'none'
                     issue.category = category if category
                     issue.fixed_version = fixed_version if fixed_version
                     issue.start_date = params[:start_date] unless params[:start_date].blank?
                     issue.due_date = params[:due_date] unless params[:due_date].blank?
                     issue.done_ratio = params[:done_ratio] unless params[:done_ratio].blank?
                     # Don't save any change to the issue if the user is not authorized to apply the requested status
                     if (status.nil? || (issue.status.new_status_allowed_to?(status, current_role, issue.tracker) && issue.status = status)) && issue.save
                       # Send notification for each issue (if changed)
                       Mailer.deliver_issue_edit(journal) if journal.details.any? && Setting.notified_events.include?('issue_updated')
                     else
                       # 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, unsaved_issue_ids.size, issues.size, '#' + unsaved_issue_ids.join(', #'))
                   end
                   redirect_to :controller => 'issues', :action => 'index', :project_id => @project
                   return
                 end
                 # Find potential statuses the user could be allowed to switch issues to
                 @available_statuses = Workflow.find(:all, :include => :new_status,
                                                           :conditions => {:role_id => current_role.id}).collect(&:new_status).compact.uniq
                 render :update do |page|
                   page.hide 'query_form'
                   page.replace_html  'bulk-edit', :partial => 'issues/bulk_edit_form'
                 end
               end
               def move_issues
                 @issues = @project.issues.find(params[:issue_ids]) if params[:issue_ids]
                 redirect_to :controller => 'issues', :action => 'index', :project_id => @project and return unless @issues
                 @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
                   @projects = Project.find(:all, :conditions => Project.visible_by(User.current), :order => 'name')
                 else
                   User.current.memberships.each {|m| @projects << m.project if m.role.allowed_to?(:move_issues)}
                 end
                 @target_project = @projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
                 @target_project ||= @project
                 @trackers = @target_project.trackers
                 if request.post?
                   new_tracker = params[:new_tracker_id].blank? ? nil : @target_project.trackers.find_by_id(params[:new_tracker_id])
                   unsaved_issue_ids = []
                   @issues.each do |issue|
                     unsaved_issue_ids << issue.id unless issue.move_to(@target_project, new_tracker)
                   end
                   if unsaved_issue_ids.empty?
                     flash[:notice] = l(:notice_successful_update) unless @issues.empty?
                   else
                     flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, @issues.size, '#' + unsaved_issue_ids.join(', #'))
                   end
                   redirect_to :controller => 'issues', :action => 'index', :project_id => @project
                   return
                 end
                 render :layout => false if request.xhr?
               end
               # Add a news to @project
               def add_news
                 @news = News.new(:project => @project, :author => User.current)
                 if request.post?
                   @news.attributes = params[:news]
                   if @news.save
                     flash[:notice] = l(:notice_successful_create)
                     Mailer.deliver_news_added(@news) if Setting.notified_events.include?('news_added')
                     redirect_to :controller => 'news', :action => 'index', :project_id => @project
                   end
                 end
               end
               def add_file
                 if request.post?
                   @version = @project.versions.find_by_id(params[:version_id])
                   attachments = attach_files(@version, params[:attachments])
                   Mailer.deliver_attachments_added(attachments) if !attachments.empty? && Setting.notified_events.include?('file_added')
                   redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                 end
                 @versions = @project.versions.sort
               end
               def list_files
                 @versions = @project.versions.sort
               end
               # Show changelog for @project
               def changelog
                 @trackers = @project.trackers.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
                 @versions = @project.versions.sort
               end
               def roadmap
                 @trackers = @project.trackers.find(:all, :conditions => ["is_in_roadmap=?", true])
                 retrieve_selected_tracker_ids(@trackers)
                 @versions = @project.versions.sort
                 @versions = @versions.select {|v| !v.completed? } unless params[:completed]
               end
               def activity
                 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
                 case params[:format]
                 when 'atom'
                   # 30 last days
                   @date_from = Date.today - 30
                   @date_to = Date.today + 1
                 else
                   # current month
                   @date_from = Date.civil(@year, @month, 1)
                   @date_to = @date_from >> 1
                 end
                 @event_types = %w(issues news files documents changesets wiki_pages messages)
                 @event_types.delete('wiki_pages') unless @project.wiki
                 @event_types.delete('changesets') unless @project.repository
                 @event_types.delete('messages') unless @project.boards.any?
                 # only show what the user is allowed to view
                 @event_types = @event_types.select {|o| User.current.allowed_to?("view_#{o}".to_sym, @project)}
                 @scope = @event_types.select {|t| params["show_#{t}"]}
                 # default events if none is specified in parameters
                 @scope = (@event_types - %w(wiki_pages messages))if @scope.empty?
                 @events = []
                 if @scope.include?('issues')
                   @events += @project.issues.find(:all, :include => [:author, :tracker], :conditions => ["#{Issue.table_name}.created_on>=? and #{Issue.table_name}.created_on<=?", @date_from, @date_to] )
                   @events += @project.issues_status_changes(@date_from, @date_to)
                 end
                 if @scope.include?('news')
                   @events += @project.news.find(:all, :conditions => ["#{News.table_name}.created_on>=? and #{News.table_name}.created_on<=?", @date_from, @date_to], :include => :author )
                 end
                 if @scope.include?('files')
                   @events += Attachment.find(:all, :select => "#{Attachment.table_name}.*", :joins => "LEFT JOIN #{Version.table_name} ON #{Version.table_name}.id = #{Attachment.table_name}.container_id", :conditions => ["#{Attachment.table_name}.container_type='Version' and #{Version.table_name}.project_id=? and #{Attachment.table_name}.created_on>=? and #{Attachment.table_name}.created_on<=?", @project.id, @date_from, @date_to], :include => :author )
                 end
                 if @scope.include?('documents')
                   @events += @project.documents.find(:all, :conditions => ["#{Document.table_name}.created_on>=? and #{Document.table_name}.created_on<=?", @date_from, @date_to] )
                   @events += Attachment.find(:all, :select => "attachments.*", :joins => "LEFT JOIN #{Document.table_name} ON #{Document.table_name}.id = #{Attachment.table_name}.container_id", :conditions => ["#{Attachment.table_name}.container_type='Document' and #{Document.table_name}.project_id=? and #{Attachment.table_name}.created_on>=? and #{Attachment.table_name}.created_on<=?", @project.id, @date_from, @date_to], :include => :author )
                 end
                 if @scope.include?('wiki_pages')
                   select = "#{WikiContent.versioned_table_name}.updated_on, #{WikiContent.versioned_table_name}.comments, " +
                            "#{WikiContent.versioned_table_name}.#{WikiContent.version_column}, #{WikiPage.table_name}.title, " +
                            "#{WikiContent.versioned_table_name}.page_id, #{WikiContent.versioned_table_name}.author_id, " +
                            "#{WikiContent.versioned_table_name}.id"
                   joins = "LEFT JOIN #{WikiPage.table_name} ON #{WikiPage.table_name}.id = #{WikiContent.versioned_table_name}.page_id " +
                           "LEFT JOIN #{Wiki.table_name} ON #{Wiki.table_name}.id = #{WikiPage.table_name}.wiki_id "
                   conditions = ["#{Wiki.table_name}.project_id = ? AND #{WikiContent.versioned_table_name}.updated_on BETWEEN ? AND ?",
                                 @project.id, @date_from, @date_to]
                   @events += WikiContent.versioned_class.find(:all, :select => select, :joins => joins, :conditions => conditions)
                 end
                 if @scope.include?('changesets')
                   @events += Changeset.find(:all, :include => :repository, :conditions => ["#{Repository.table_name}.project_id = ? AND #{Changeset.table_name}.committed_on BETWEEN ? AND ?", @project.id, @date_from, @date_to])
                 end
                 if @scope.include?('messages')
                   @events += Message.find(:all,
                                           :include => [:board, :author],
                                           :conditions => ["#{Board.table_name}.project_id=? AND #{Message.table_name}.parent_id IS NULL AND #{Message.table_name}.created_on BETWEEN ? AND ?", @project.id, @date_from, @date_to])
                 end
                 @events_by_day = @events.group_by(&:event_date)
                 respond_to do |format|
                   format.html { render :layout => false if request.xhr? }
                   format.atom { render_feed(@events, :title => "#{@project.name}: #{l(:label_activity)}") }
                 end
               end
               def calendar
                 @trackers = @project.rolled_up_trackers
                 retrieve_selected_tracker_ids(@trackers)
                 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)
                 events = []
                 @project.issues_with_subprojects(params[:with_subprojects]) do
                   events += Issue.find(:all,
                                        :include => [:tracker, :status, :assigned_to, :priority, :project],
                                        :conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?)) AND #{Issue.table_name}.tracker_id IN (#{@selected_tracker_ids.join(',')})", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
                                        ) unless @selected_tracker_ids.empty?
                 end
                 events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
                 @calendar.events = events
                 render :layout => false if request.xhr?
               end
               def gantt
                 @trackers = @project.rolled_up_trackers
                 retrieve_selected_tracker_ids(@trackers)
                 if params[:year] and params[:year].to_i >0
                   @year_from = params[:year].to_i
                   if params[:month] and params[:month].to_i >=1 and params[:month].to_i <= 12
                     @month_from = params[:month].to_i
                   else
                     @month_from = 1
                   end
                 else
                   @month_from ||= Date.today.month
                   @year_from ||= Date.today.year
                 end
                 zoom = (params[:zoom] || User.current.pref[:gantt_zoom]).to_i
                 @zoom = (zoom > 0 && zoom < 5) ? zoom : 2
                 months = (params[:months] || User.current.pref[:gantt_months]).to_i
                 @months = (months > 0 && months < 25) ? months : 6
                 # Save gantt paramters as user preference (zoom and months count)
                 if (User.current.logged? && (@zoom != User.current.pref[:gantt_zoom] || @months != User.current.pref[:gantt_months]))
                   User.current.pref[:gantt_zoom], User.current.pref[:gantt_months] = @zoom, @months
                   User.current.preference.save
                 end
                 @date_from = Date.civil(@year_from, @month_from, 1)
                 @date_to = (@date_from >> @months) - 1
                 @events = []
                 @project.issues_with_subprojects(params[:with_subprojects]) do
                   @events += Issue.find(:all,
                                        :order => "start_date, due_date",
                                        :include => [:tracker, :status, :assigned_to, :priority, :project],
                                        :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 and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}))", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to]
                                        ) unless @selected_tracker_ids.empty?
                 end
                 @events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to])
                 @events.sort! {|x,y| x.start_date <=> y.start_date }
                 if params[:format]=='pdf'
                   @options_for_rfpdf ||= {}
                   @options_for_rfpdf[:file_name] = "#{@project.identifier}-gantt.pdf"
                   render :template => "projects/gantt.rfpdf", :layout => false
                 elsif params[:format]=='png' && respond_to?('gantt_image')
                   image = gantt_image(@events, @date_from, @months, @zoom)
                   image.format = 'PNG'
                   send_data(image.to_blob, :disposition => 'inline', :type => 'image/png', :filename => "#{@project.identifier}-gantt.png")
                 else
                   render :template => "projects/gantt.rhtml"
                 end
               end
             private
               # Find project of id params[:id]
               # if not found, redirect to project list
               # Used as a before_filter
               def find_project
                 @project = Project.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def retrieve_selected_tracker_ids(selectable_trackers)
                 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 = selectable_trackers.collect {|t| t.id.to_s }
                 end
               end
             end

app/helpers/projects_helper.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  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 ProjectsHelper
               def link_to_version(version, options = {})
                 return '' unless version && version.is_a?(Version)
                 link_to version.name, {:controller => 'projects',
                                        :action => 'roadmap',
                                        :id => version.project_id,
                                        :completed => (version.completed? ? 1 : nil),
                                        :anchor => version.name
                                       }, options
               end
               def project_settings_tabs
                 tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural},
                         {:name => 'modules', :action => :select_project_modules, :partial => 'projects/settings/modules', :label => :label_module_plural},
                         {:name => 'members', :action => :manage_members, :partial => 'projects/settings/members', :label => :label_member_plural},
                         {:name => 'versions', :action => :manage_versions, :partial => 'projects/settings/versions', :label => :label_version_plural},
                         {:name => 'categories', :action => :manage_categories, :partial => 'projects/settings/issue_categories', :label => :label_issue_category_plural},
                         {:name => 'wiki', :action => :manage_wiki, :partial => 'projects/settings/wiki', :label => :label_wiki},
                         {:name => 'repository', :action => :manage_repository, :partial => 'projects/settings/repository', :label => :label_repository},
                         {:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural}
                         ]
                 tabs.select {|tab| User.current.allowed_to?(tab[:action], @project)}
               end
               # Generates a gantt image
               # Only defined if RMagick is avalaible
               def gantt_image(events, date_from, months, zoom)
                 date_to = (date_from >> months)-1
                 show_weeks = zoom > 1
                 show_days = zoom > 2
                 subject_width = 320
                 header_heigth = 18
                 # width of one day in pixels
                 zoom = zoom*2
                 g_width = (date_to - date_from + 1)*zoom
                 g_height = 20 * events.length + 20
                 headers_heigth = (show_weeks ? 2*header_heigth : header_heigth)
                 height = g_height + headers_heigth
                 imgl = Magick::ImageList.new
                 imgl.new_image(subject_width+g_width+1, height)
                 gc = Magick::Draw.new
                 # Subjects
                 top = headers_heigth + 20
                 gc.fill('black')
                 gc.stroke('transparent')
                 gc.stroke_width(1)
                 events.each do |i|
                   gc.text(4, top + 2, (i.is_a?(Issue) ? i.subject : i.name))
                   top = top + 20
                 end
                 # Months headers
                 month_f = date_from
                 left = subject_width
                 months.times do
                   width = ((month_f >> 1) - month_f) * zoom
                   gc.fill('white')
                   gc.stroke('grey')
                   gc.stroke_width(1)
                   gc.rectangle(left, 0, left + width, height)
                   gc.fill('black')
                   gc.stroke('transparent')
                   gc.stroke_width(1)
                   gc.text(left.round + 8, 14, "#{month_f.year}-#{month_f.month}")
                   left = left + width
                   month_f = month_f >> 1
                 end
                 # Weeks headers
                 if show_weeks
                 	left = subject_width
                 	height = header_heigth
                 	if date_from.cwday == 1
                 	    # date_from is monday
                         week_f = date_from
                 	else
                 	    # find next monday after date_from
                 		week_f = date_from + (7 - date_from.cwday + 1)
                 		width = (7 - date_from.cwday + 1) * zoom
                         gc.fill('white')
                         gc.stroke('grey')
                         gc.stroke_width(1)
                         gc.rectangle(left, header_heigth, left + width, 2*header_heigth + g_height-1)
                 		left = left + width
                 	end
                 	while week_f <= date_to
                 		width = (week_f + 6 <= date_to) ? 7 * zoom : (date_to - week_f + 1) * zoom
                         gc.fill('white')
                         gc.stroke('grey')
                         gc.stroke_width(1)
                         gc.rectangle(left.round, header_heigth, left.round + width, 2*header_heigth + g_height-1)
                         gc.fill('black')
                         gc.stroke('transparent')
                         gc.stroke_width(1)
                         gc.text(left.round + 2, header_heigth + 14, week_f.cweek.to_s)
                 		left = left + width
                 		week_f = week_f+7
                 	end
                 end
                 # Days details (week-end in grey)
                 if show_days
                 	left = subject_width
                 	height = g_height + header_heigth - 1
                 	wday = date_from.cwday
                 	(date_to - date_from + 1).to_i.times do
                       width =  zoom
                       gc.fill(wday == 6 || wday == 7 ? '#eee' : 'white')
                       gc.stroke('grey')
                       gc.stroke_width(1)
                       gc.rectangle(left, 2*header_heigth, left + width, 2*header_heigth + g_height-1)
                       left = left + width
                       wday = wday + 1
                       wday = 1 if wday > 7
                 	end
                 end
                 # border
                 gc.fill('transparent')
                 gc.stroke('grey')
                 gc.stroke_width(1)
                 gc.rectangle(0, 0, subject_width+g_width, headers_heigth)
                 gc.stroke('black')
                 gc.rectangle(0, 0, subject_width+g_width, g_height+ headers_heigth-1)
                 # content
                 top = headers_heigth + 20
                 gc.stroke('transparent')
                 events.each do |i|
                   if i.is_a?(Issue)
                     i_start_date = (i.start_date >= date_from ? i.start_date : date_from )
                     i_end_date = (i.due_date <= date_to ? i.due_date : date_to )
                     i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor
                     i_done_date = (i_done_date <= date_from ? date_from : i_done_date )
                     i_done_date = (i_done_date >= date_to ? date_to : i_done_date )
                     i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today
                     i_left = subject_width + ((i_start_date - date_from)*zoom).floor
                     i_width = ((i_end_date - i_start_date + 1)*zoom).floor                  # total width of the issue
                     d_width = ((i_done_date - i_start_date)*zoom).floor                     # done width
                     l_width = i_late_date ? ((i_late_date - i_start_date+1)*zoom).floor : 0 # delay width
                     gc.fill('grey')
                     gc.rectangle(i_left, top, i_left + i_width, top - 6)
                     gc.fill('red')
                     gc.rectangle(i_left, top, i_left + l_width, top - 6) if l_width > 0
                     gc.fill('blue')
                     gc.rectangle(i_left, top, i_left + d_width, top - 6) if d_width > 0
                     gc.fill('black')
                     gc.text(i_left + i_width + 5,top + 1, "#{i.status.name} #{i.done_ratio}%")
                   else
                     i_left = subject_width + ((i.start_date - date_from)*zoom).floor
                     gc.fill('green')
                     gc.rectangle(i_left, top, i_left + 6, top - 6)
                     gc.fill('black')
                     gc.text(i_left + 11, top + 1, i.name)
                   end
                   top = top + 20
                 end
                 # today red line
                 if Date.today >= date_from and Date.today <= date_to
                   gc.stroke('red')
                   x = (Date.today-date_from+1)*zoom + subject_width
                   gc.line(x, headers_heigth, x, headers_heigth + g_height-1)
                 end
                 gc.draw(imgl)
                 imgl
               end if Object.const_defined?(:Magick)
               def new_issue_selector
                 trackers = @project.trackers
                 # can't use form tag inside helper
                 content_tag('form',
                   select_tag('tracker_id', '<option></option>' + options_from_collection_for_select(trackers, 'id', 'name'), :onchange => "if (this.value != '') {this.form.submit()}"),
-                  :action => url_for(:controller => 'projects', :action => 'add_issue', :id => @project), :method => 'get')
+                  :action => url_for(:controller => 'issues', :action => 'new', :project_id => @project), :method => 'get')
               end
             end

app/views/issues/_form.rhtml +7 0

             <%= error_messages_for 'issue' %>
             <div class="box">
+            <% if @issue.new_record? %>
+            <p><%= f.select :tracker_id, @project.trackers.collect {|t| [t.name, t.id]}, :required => true %></p>
+            <%= observe_field :issue_tracker_id, :url => { :action => :new },
+                                                 :update => :content,
+                                                 :with => "Form.serialize('issue-form')" %>
+            <% end %>
             <div class="splitcontentleft">
             <% if @issue.new_record? %>
             <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %></p>
             <% else %>
             <p><label><%= l(:field_status) %></label> <%= @issue.status.name %></p>
             <% end %>
             <p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), :required => true %></p>
             <p><%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %></p>
             <p><%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %>
             <%= prompt_to_remote(l(:label_issue_category_new),
                                  l(:label_issue_category_new), 'category[name]',
                                  {:controller => 'projects', :action => 'add_issue_category', :id => @project},
                                  :class => 'small') if authorize_for('projects', 'add_issue_category') %></p>
             </div>
             <div class="splitcontentright">
             <p><%= f.text_field :start_date, :size => 10 %><%= calendar_for('issue_start_date') %></p>
             <p><%= f.text_field :due_date, :size => 10 %><%= calendar_for('issue_due_date') %></p>
             <p><%= f.text_field :estimated_hours, :size => 3 %> <%= l(:field_hours) %></p>
             <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
             </div>
             <p><%= f.text_field :subject, :size => 80, :required => true %></p>
             <p><%= f.text_area :description, :required => true,
                                :cols => 60,
                                :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
                                :accesskey => accesskey(:edit),
                                :class => 'wiki-edit' %></p>
             <p><%= f.select :fixed_version_id, (@project.versions.sort.collect {|v| [v.name, v.id]}), { :include_blank => true } %></p>
             <% for @custom_value in @custom_values %>
             	<p><%= custom_field_tag_with_label @custom_value %></p>
             <% end %>
             <% if @issue.new_record? %>
             <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
             <%= image_to_function "add.png", "addFileField();return false" %></label>
             <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
             <% end %>
             </div>
             <%= wikitoolbar_for 'issue_description' %>
             <% content_for :header_tags do %>
                 <%= javascript_include_tag 'calendar/calendar' %>
                 <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
                 <%= javascript_include_tag 'calendar/calendar-setup' %>
                 <%= stylesheet_link_tag 'calendar' %>
             <% end %>

app/views/issues/_sidebar.rhtml +1 -1

-            <% if authorize_for('projects', 'add_issue') && @project.trackers.any? %>
+            <% if authorize_for('issues', 'new') && @project.trackers.any? %>
             <h3><%= l(:label_issue_new) %></h3>
             <%= l(:label_tracker) %>: <%= new_issue_selector %>
             <% end %>
             <h3><%= l(:label_issue_plural) %></h3>
             <%= link_to l(:label_issue_view_all), { :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 } %><br />
             <%= link_to l(:field_summary), :controller => 'reports', :action => 'issue_report', :id => @project %><br />
             <%= link_to l(:label_change_log), :controller => 'projects', :action => 'changelog', :id => @project %>
             <h3><%= l(:label_query_plural) %></h3>
             <% queries = @project.queries.find(:all,
                                                :order => "name ASC",
                                                :conditions => ["is_public = ? or user_id = ?", true, (User.current.logged? ? User.current.id : 0)])
                queries.each do |query| %>
             <%= link_to query.name, :controller => 'issues', :action => 'index', :project_id => @project, :query_id => query %><br />
             <% end %>

app/views/issues/context_menu.rhtml +1 -1

             <% back_to = url_for(:controller => 'issues', :action => 'index', :project_id => @project) %>
             <ul>
             	<li><%= context_menu_link l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue},
             	        :class => 'icon-edit', :disabled => !@can[:edit] %></li>
             	<li class="folder">
             		<a href="#" class="submenu" onclick="return false;"><%= l(:field_status) %></a>
             		<ul>
             		<% @statuses.each do |s| %>
             		    <li><%= context_menu_link s.name, {:controller => 'issues', :action => 'update', :id => @issue, :issue => {:status_id => s}},
             		                              :selected => (s == @issue.status), :disabled => !(@allowed_statuses.include?(s)) %></li>
             		<% end %>
             		</ul>
             	</li>
             	<li class="folder">
             		<a href="#" class="submenu"><%= l(:field_priority) %></a>
             		<ul>
             		<% @priorities.each do |p| %>
             		    <li><%= context_menu_link p.name, {:controller => 'issues', :action => 'edit', :id => @issue, 'issue[priority_id]' => p, :back_to => back_to}, :method => :post,
             		                              :selected => (p == @issue.priority), :disabled => !@can[:edit] %></li>
             		<% end %>
             		</ul>
             	</li>
             	<li class="folder">
             		<a href="#" class="submenu"><%= l(:field_assigned_to) %></a>
             		<ul>
             		<% @assignables.each do |u| %>
             		    <li><%= context_menu_link u.name, {:controller => 'issues', :action => 'update', :id => @issue, :issue => {:assigned_to_id => u}, :back_to => back_to}, :method => :post,
             		                              :selected => (u == @issue.assigned_to), :disabled => !@can[:assign] %></li>
             		<% end %>
             		    <li><%= context_menu_link l(:label_nobody), {:controller => 'issues', :action => 'update', :id => @issue, :issue => {:assigned_to_id => nil}, :back_to => back_to}, :method => :post,
             		                              :selected => @issue.assigned_to.nil?, :disabled => !@can[:assign] %></li>
             		</ul>
             	</li>
-            	<li><%= context_menu_link l(:button_copy), {:controller => 'projects', :action => 'add_issue', :id => @project, :copy_from => @issue},
+            	<li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue},
             	        :class => 'icon-copy', :disabled => !@can[:copy] %></li>
             	<li><%= context_menu_link l(:button_move), {:controller => 'projects', :action => 'move_issues', :id => @project, "issue_ids[]" => @issue.id },
             	                          :class => 'icon-move', :disabled => !@can[:move]  %>
                 <li><%= context_menu_link l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue},
                                           :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon-del', :disabled => !@can[:delete] %></li>
             </ul>

app/views/issues/new.rhtml ~~app/views/projects/add_issue.rhtml~~ renamed 0 -2

             <h2><%=l(:label_issue_new)%>: <%= @issue.tracker %></h2>
             <% labelled_tabular_form_for :issue, @issue,
-                                         :url => {:action => 'add_issue'},
                                          :html => {:multipart => true, :id => 'issue-form'} do |f| %>
-                <%= f.hidden_field :tracker_id %>
                 <%= render :partial => 'issues/form', :locals => {:f => f} %>
                 <%= submit_tag l(:button_create) %>
                 <%= link_to_remote l(:label_preview),
                                    { :url => { :controller => 'issues', :action => 'preview', :id => @issue },
                                      :method => 'post',
                                      :update => 'preview',
                                      :with => "Form.serialize('issue-form')",
                                      :complete => "location.href='#preview-top'"
                                    }, :accesskey => accesskey(:preview) %>
             <% end %>
             <a name="preview-top"></a>
             <div id="preview" class="wiki"></div>

app/views/issues/show.rhtml +1 -1

             <div class="contextual">
             <%= show_and_goto_link(l(:button_update), 'update', :class => 'icon icon-note') if authorize_for('issues', 'update') %>
             <%= link_to_if_authorized l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue}, :class => 'icon icon-edit', :accesskey => accesskey(:edit) %>
             <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue}, :class => 'icon icon-time' %>
             <%= watcher_tag(@issue, User.current) %>
-            <%= link_to_if_authorized l(:button_copy), {:controller => 'projects', :action => 'add_issue', :id => @project, :copy_from => @issue }, :class => 'icon icon-copy' %>
+            <%= link_to_if_authorized l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-copy' %>
             <%= link_to_if_authorized l(:button_move), {:controller => 'projects', :action => 'move_issues', :id => @project, "issue_ids[]" => @issue.id }, :class => 'icon icon-move' %>
             <%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
             </div>
             <h2><%= @issue.tracker.name %> #<%= @issue.id %></h2>
             <div class="issue <%= "status-#{@issue.status.position} priority-#{@issue.priority.position}" %>">
                     <h3><%=h @issue.subject %></h3>
                     <p class="author">
                     <%= authoring @issue.created_on, @issue.author %>.
                     <%= l(:label_updated_time, distance_of_time_in_words(Time.now, @issue.updated_on)) if @issue.created_on != @issue.updated_on %>.
                     </p>
             <table width="100%">
             <tr>
                 <td style="width:15%"><b><%=l(:field_status)%> :</b></td><td style="width:35%"><%= @issue.status.name %></td>
                 <td style="width:15%"><b><%=l(:field_start_date)%> :</b></td><td style="width:35%"><%= format_date(@issue.start_date) %></td>
             </tr>
             <tr>
                 <td><b><%=l(:field_priority)%> :</b></td><td><%= @issue.priority.name %></td>
                 <td><b><%=l(:field_due_date)%> :</b></td><td><%= format_date(@issue.due_date) %></td>
             </tr>
             <tr>
                 <td><b><%=l(:field_assigned_to)%> :</b></td><td><%= @issue.assigned_to ? link_to_user(@issue.assigned_to) : "-" %></td>
                 <td><b><%=l(:field_done_ratio)%> :</b></td><td><%= progress_bar @issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%" %></td>
             </tr>
             <tr>
                 <td><b><%=l(:field_category)%> :</b></td><td><%=h @issue.category ? @issue.category.name : "-" %></td>
                 <% if User.current.allowed_to?(:view_time_entries, @project) %>
                 <td><b><%=l(:label_spent_time)%> :</b></td>
                 <td><%= @issue.spent_hours > 0 ? (link_to lwr(:label_f_hour, @issue.spent_hours), {:controller => 'timelog', :action => 'details', :issue_id => @issue}, :class => 'icon icon-time') : "-" %></td>
                 <% end %>
             </tr>
             <tr>
                 <td><b><%=l(:field_fixed_version)%> :</b></td><td><%= @issue.fixed_version ? link_to_version(@issue.fixed_version) : "-" %></td>
                 <% if @issue.estimated_hours %>
                 <td><b><%=l(:field_estimated_hours)%> :</b></td><td><%= lwr(:label_f_hour, @issue.estimated_hours) %></td>
                 <% end %>
             </tr>
             <tr>
             <% n = 0
             for custom_value in @custom_values %>
                 <td valign="top"><b><%= custom_value.custom_field.name %> :</b></td><td valign="top"><%= simple_format(h(show_value(custom_value))) %></td>
             <% n = n + 1
                if (n > 1)
                     n = 0 %>
                     </tr><tr>
              <%end
             end %>
             </tr>
             </table>
             <hr />
             <% if @issue.changesets.any? %>
             <div style="float:right;">
               <em><%= l(:label_revision_plural) %>: <%= @issue.changesets.collect{|changeset| link_to(changeset.revision, :controller => 'repositories', :action => 'revision', :id => @project, :rev => changeset.revision)}.join(", ") %></em>
             </div>
             <% end %>
             <p><strong><%=l(:field_description)%></strong></p>
             <div class="wiki">
             <%= textilizable @issue, :description, :attachments => @issue.attachments %>
             </div>
             <% if @issue.attachments.any? %>
             <%= link_to_attachments @issue.attachments, :delete_url => (authorize_for('issues', 'destroy_attachment') ? {:controller => 'issues', :action => 'destroy_attachment', :id => @issue} : nil) %>
             <% end %>
             <% if authorize_for('issue_relations', 'new') || @issue.relations.any? %>
             <hr />
             <div id="relations">
             <%= render :partial => 'relations' %>
             </div>
             <% end %>
             </div>
             <% if @journals.any? %>
             <div id="history">
             <h3><%=l(:label_history)%></h3>
             <%= render :partial => 'history', :locals => { :journals => @journals } %>
             </div>
             <% end %>
             <% if authorize_for('issues', 'update') %>
               <a name="update-anchor"></a>
               <div id="update" style="display:none;">
               <h3><%= l(:button_update) %></h3>
               <%= render :partial => 'update' %>
               <%= toggle_link l(:button_cancel), 'update' %>
               </div>
             <% end %>
             <div class="contextual">
             <%= l(:label_export_to) %><%= link_to 'PDF', {:format => 'pdf'}, :class => 'icon icon-pdf' %>
             </div>
             &nbsp;
             <% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
             <% content_for :sidebar do %>
                 <%= render :partial => 'issues/sidebar' %>
             <% end %>

app/views/projects/show.rhtml +1 -1

             <h2><%=l(:label_overview)%></h2>
             <div class="splitcontentleft">
             	<%= textilizable @project.description %>
             	<ul>
             	<% unless @project.homepage.blank? %><li><%=l(:field_homepage)%>: <%= auto_link @project.homepage %></li><% end %>
                 <% if @subprojects.any? %>
              	<li><%=l(:label_subproject_plural)%>: <%= @subprojects.collect{|p| link_to(h(p.name), :action => 'show', :id => p)}.join(", ") %></li>
                 <% end %>
             	<% if @project.parent %>
             	<li><%=l(:field_parent)%>: <%= link_to h(@project.parent.name), :controller => 'projects', :action => 'show', :id => @project.parent %></li>
             	<% end %>
             	<% for custom_value in @custom_values %>
             	<% if !custom_value.value.empty? %>
             	   <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
             	<% end %>
             	<% end %>
             	</ul>
               <% if User.current.allowed_to?(:view_issues, @project) %>
               <div class="box">
                 <h3 class="icon22 icon22-tracker"><%=l(:label_issue_tracking)%></h3>
                 <ul>
                 <% for tracker in @trackers %>
                   <li><%= link_to tracker.name, :controller => 'issues', :action => 'index', :project_id => @project,
                                                             :set_filter => 1,
                                                             "tracker_id" => tracker.id %>:
                   <%= @open_issues_by_tracker[tracker] || 0 %> <%= lwr(:label_open_issues, @open_issues_by_tracker[tracker] || 0) %>
                   <%= l(:label_on) %> <%= @total_issues_by_tracker[tracker] || 0 %></li>
                 <% end %>
                 </ul>
                 <p><%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 %></p>
               </div>
               <% end %>
             </div>
             <div class="splitcontentright">
                 <% if @members_by_role.any? %>
             	<div class="box">
             		<h3 class="icon22 icon22-users"><%=l(:label_member_plural)%></h3>
             		<p><% @members_by_role.keys.sort.each do |role| %>
             		<%= role.name %>:
             		<%= @members_by_role[role].collect(&:user).sort.collect{|u| link_to_user u}.join(", ") %>
             		<br />
             		<% end %></p>
             	</div>
             	<% end %>
               <% if @news.any? && authorize_for('news', 'index') %>
               <div class="box">
                 <h3><%=l(:label_news_latest)%></h3>
                 <%= render :partial => 'news/news', :collection => @news %>
                 <p><%= link_to l(:label_news_view_all), :controller => 'news', :action => 'index', :project_id => @project %></p>
               </div>
               <% end %>
             </div>
             <% content_for :sidebar do %>
-                <% if authorize_for('projects', 'add_issue') && @project.trackers.any? %>
+                <% if authorize_for('issues', 'new') && @project.trackers.any? %>
                 <h3><%= l(:label_issue_new) %></h3>
                 <%= l(:label_tracker) %>: <%= new_issue_selector %>
                 <% end %>
                 <% planning_links = []
                   planning_links << link_to_if_authorized(l(:label_calendar), :action => 'calendar', :id => @project)
                   planning_links << link_to_if_authorized(l(:label_gantt), :action => 'gantt', :id => @project)
                   planning_links.compact!
                   unless planning_links.empty? %>
                 <h3>Planning</h3>
                 <p><%= planning_links.join(' | ') %></p>
                 <% end %>
                 <% if @total_hours && User.current.allowed_to?(:view_time_entries, @project) %>
                 <h3><%= l(:label_spent_time) %></h3>
                 <p><span class="icon icon-time"><%= lwr(:label_f_hour, @total_hours) %></span></p>
                 <p><%= link_to(l(:label_details), {:controller => 'timelog', :action => 'details', :project_id => @project}) %> |
                 <%= link_to(l(:label_report), {:controller => 'timelog', :action => 'report', :project_id => @project}) %></p>
                 <% end %>
             <% end %>
             <% content_for :header_tags do %>
             <%= auto_discovery_link_tag(:atom, {:action => 'activity', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
             <% end %>
             <% html_title(l(:label_overview)) -%>

lib/redmine.rb +1 -1

             require 'redmine/access_control'
             require 'redmine/menu_manager'
             require 'redmine/mime_type'
             require 'redmine/themes'
             require 'redmine/plugin'
             begin
               require_library_or_gem 'RMagick' unless Object.const_defined?(:Magick)
             rescue LoadError
               # RMagick is not available
             end
             REDMINE_SUPPORTED_SCM = %w( Subversion Darcs Mercurial Cvs Bazaar )
             # Permissions
             Redmine::AccessControl.map do |map|
               map.permission :view_project, {:projects => [:show, :activity]}, :public => true
               map.permission :search_project, {:search => :index}, :public => true
               map.permission :edit_project, {:projects => [:settings, :edit]}, :require => :member
               map.permission :select_project_modules, {:projects => :modules}, :require => :member
               map.permission :manage_members, {:projects => :settings, :members => [:new, :edit, :destroy]}, :require => :member
               map.permission :manage_versions, {:projects => [:settings, :add_version], :versions => [:edit, :destroy]}, :require => :member
               map.project_module :issue_tracking do |map|
                 # Issue categories
                 map.permission :manage_categories, {:projects => [:settings, :add_issue_category], :issue_categories => [:edit, :destroy]}, :require => :member
                 # Issues
                 map.permission :view_issues, {:projects => [:changelog, :roadmap],
                                               :issues => [:index, :changes, :show, :context_menu],
                                               :versions => [:show, :status_by],
                                               :queries => :index,
                                               :reports => :issue_report}, :public => true
-                map.permission :add_issues, {:projects => :add_issue}
+                map.permission :add_issues, {:issues => :new}
                 map.permission :edit_issues, {:projects => :bulk_edit_issues,
                                               :issues => [:edit, :update, :destroy_attachment]}
                 map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
                 map.permission :add_issue_notes, {:issues => :update}
                 map.permission :move_issues, {:projects => :move_issues}, :require => :loggedin
                 map.permission :delete_issues, {:issues => :destroy}, :require => :member
                 # Queries
                 map.permission :manage_public_queries, {:queries => [:new, :edit, :destroy]}, :require => :member
                 map.permission :save_queries, {:queries => [:new, :edit, :destroy]}, :require => :loggedin
                 # Gantt & calendar
                 map.permission :view_gantt, :projects => :gantt
                 map.permission :view_calendar, :projects => :calendar
               end
               map.project_module :time_tracking do |map|
                 map.permission :log_time, {:timelog => :edit}, :require => :loggedin
                 map.permission :view_time_entries, :timelog => [:details, :report]
               end
               map.project_module :news do |map|
                 map.permission :manage_news, {:projects => :add_news, :news => [:edit, :destroy, :destroy_comment]}, :require => :member
                 map.permission :view_news, {:news => [:index, :show]}, :public => true
                 map.permission :comment_news, {:news => :add_comment}
               end
               map.project_module :documents do |map|
                 map.permission :manage_documents, {:documents => [:new, :edit, :destroy, :add_attachment, :destroy_attachment]}, :require => :loggedin
                 map.permission :view_documents, :documents => [:index, :show, :download]
               end
               map.project_module :files do |map|
                 map.permission :manage_files, {:projects => :add_file, :versions => :destroy_file}, :require => :loggedin
                 map.permission :view_files, :projects => :list_files, :versions => :download
               end
               map.project_module :wiki do |map|
                 map.permission :manage_wiki, {:wikis => [:edit, :destroy]}, :require => :member
                 map.permission :rename_wiki_pages, {:wiki => :rename}, :require => :member
                 map.permission :delete_wiki_pages, {:wiki => :destroy}, :require => :member
                 map.permission :view_wiki_pages, :wiki => [:index, :history, :diff, :annotate, :special]
                 map.permission :edit_wiki_pages, :wiki => [:edit, :preview, :add_attachment, :destroy_attachment]
               end
               map.project_module :repository do |map|
                 map.permission :manage_repository, {:repositories => [:edit, :destroy]}, :require => :member
                 map.permission :browse_repository, :repositories => [:show, :browse, :entry, :annotate, :changes, :diff, :stats, :graph]
                 map.permission :view_changesets, :repositories => [:show, :revisions, :revision]
               end
               map.project_module :boards do |map|
                 map.permission :manage_boards, {:boards => [:new, :edit, :destroy]}, :require => :member
                 map.permission :view_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true
                 map.permission :add_messages, {:messages => [:new, :reply]}
                 map.permission :edit_messages, {:messages => :edit}, :require => :member
                 map.permission :delete_messages, {:messages => :destroy}, :require => :member
               end
             end
             # Project menu configuration
             Redmine::MenuManager.map :project_menu do |menu|
               menu.push :overview, { :controller => 'projects', :action => 'show' }, :caption => :label_overview
               menu.push :activity, { :controller => 'projects', :action => 'activity' }, :caption => :label_activity
               menu.push :roadmap, { :controller => 'projects', :action => 'roadmap' }, :caption => :label_roadmap
               menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
               menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural
               menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural
               menu.push :wiki, { :controller => 'wiki', :action => 'index', :page => nil },
                           :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }, :caption => :label_wiki
               menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id,
                           :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural
               menu.push :files, { :controller => 'projects', :action => 'list_files' }, :caption => :label_attachment_plural
               menu.push :repository, { :controller => 'repositories', :action => 'show' },
                           :if => Proc.new { |p| p.repository && !p.repository.new_record? }, :caption => :label_repository
               menu.push :settings, { :controller => 'projects', :action => 'settings' }, :caption => :label_settings
             end

test/functional/issues_controller_test.rb +50 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 File.dirname(__FILE__) + '/../test_helper'
             require 'issues_controller'
             # Re-raise errors caught by the controller.
             class IssuesController; def rescue_action(e) raise e end; end
             class IssuesControllerTest < Test::Unit::TestCase
               fixtures :projects,
                        :users,
                        :roles,
                        :members,
                        :issues,
                        :issue_statuses,
                        :trackers,
+                       :projects_trackers,
                        :issue_categories,
                        :enabled_modules,
                        :enumerations,
                        :attachments,
                        :workflows
               def setup
                 @controller = IssuesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
               def test_index
                 get :index
                 assert_response :success
                 assert_template 'index.rhtml'
                 assert_not_nil assigns(:issues)
                 assert_nil assigns(:project)
               end
               def test_index_with_project
                 get :index, :project_id => 1
                 assert_response :success
                 assert_template 'index.rhtml'
                 assert_not_nil assigns(:issues)
               end
               def test_index_with_project_and_filter
                 get :index, :project_id => 1, :set_filter => 1
                 assert_response :success
                 assert_template 'index.rhtml'
                 assert_not_nil assigns(:issues)
               end
               def test_index_csv_with_project
                 get :index, :format => 'csv'
                 assert_response :success
                 assert_not_nil assigns(:issues)
                 assert_equal 'text/csv', @response.content_type
                 get :index, :project_id => 1, :format => 'csv'
                 assert_response :success
                 assert_not_nil assigns(:issues)
                 assert_equal 'text/csv', @response.content_type
               end
               def test_index_pdf
                 get :index, :format => 'pdf'
                 assert_response :success
                 assert_not_nil assigns(:issues)
                 assert_equal 'application/pdf', @response.content_type
                 get :index, :project_id => 1, :format => 'pdf'
                 assert_response :success
                 assert_not_nil assigns(:issues)
                 assert_equal 'application/pdf', @response.content_type
               end
               def test_changes
                 get :changes, :project_id => 1
                 assert_response :success
                 assert_not_nil assigns(:changes)
                 assert_equal 'application/atom+xml', @response.content_type
               end
               def test_show_by_anonymous
                 get :show, :id => 1
                 assert_response :success
                 assert_template 'show.rhtml'
                 assert_not_nil assigns(:issue)
                 assert_equal Issue.find(1), assigns(:issue)
                 # anonymous role is allowed to add a note
                 assert_tag :tag => 'form',
                            :descendant => { :tag => 'fieldset',
                                             :child => { :tag => 'legend',
                                                         :content => /Notes/ } }
               end
               def test_show_by_manager
                 @request.session[:user_id] = 2
                 get :show, :id => 1
                 assert_response :success
                 assert_tag :tag => 'form',
                            :descendant => { :tag => 'fieldset',
                                             :child => { :tag => 'legend',
                                                         :content => /Change properties/ } },
                            :descendant => { :tag => 'fieldset',
                                             :child => { :tag => 'legend',
                                                         :content => /Log time/ } },
                            :descendant => { :tag => 'fieldset',
                                             :child => { :tag => 'legend',
                                                         :content => /Notes/ } }
               end
+              def test_get_new
+                @request.session[:user_id] = 2
+                get :new, :project_id => 1, :tracker_id => 1
+                assert_response :success
+                assert_template 'new'
+              end
+              def test_get_new_without_tracker_id
+                @request.session[:user_id] = 2
+                get :new, :project_id => 1
+                assert_response :success
+                assert_template 'new'
+                issue = assigns(:issue)
+                assert_not_nil issue
+                assert_equal Project.find(1).trackers.first, issue.tracker
+              end
+              def test_update_new_form
+                @request.session[:user_id] = 2
+                xhr :post, :new, :project_id => 1,
+                                 :issue => {:tracker_id => 2,
+                                            :subject => 'This is the test_new issue',
+                                            :description => 'This is the description',
+                                            :priority_id => 5}
+                assert_response :success
+                assert_template 'new'
+              end
+              def test_post_new
+                @request.session[:user_id] = 2
+                post :new, :project_id => 1,
+                           :issue => {:tracker_id => 1,
+                                      :subject => 'This is the test_new issue',
+                                      :description => 'This is the description',
+                                      :priority_id => 5}
+                assert_redirected_to 'projects/ecookbook/issues'
+                assert Issue.find_by_subject('This is the test_new issue')
+              end
+              def test_copy_issue
+                @request.session[:user_id] = 2
+                get :new, :project_id => 1, :copy_from => 1
+                assert_template 'new'
+                assert_not_nil assigns(:issue)
+                orig = Issue.find(1)
+                assert_equal orig.subject, assigns(:issue).subject
+              end
               def test_get_edit
                 @request.session[:user_id] = 2
                 get :edit, :id => 1
                 assert_response :success
                 assert_template 'edit'
                 assert_not_nil assigns(:issue)
                 assert_equal Issue.find(1), assigns(:issue)
               end
               def test_post_edit
                 @request.session[:user_id] = 2
                 ActionMailer::Base.deliveries.clear
                 issue = Issue.find(1)
                 old_subject = issue.subject
                 new_subject = 'Subject modified by IssuesControllerTest#test_post_edit'
                 post :edit, :id => 1, :issue => {:subject => new_subject}
                 assert_redirected_to 'issues/show/1'
                 issue.reload
                 assert_equal new_subject, issue.subject
                 mail = ActionMailer::Base.deliveries.last
                 assert_kind_of TMail::Mail, mail
                 assert mail.subject.starts_with?("[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}]")
                 assert mail.body.include?("Subject changed from #{old_subject} to #{new_subject}")
               end
               def test_get_update
                 @request.session[:user_id] = 2
                 get :update, :id => 1
                 assert_response :success
                 assert_template 'update'
               end
               def test_update_with_status_and_assignee_change
                 issue = Issue.find(1)
                 assert_equal 1, issue.status_id
                 @request.session[:user_id] = 2
                 post :update,
                      :id => 1,
                      :issue => { :status_id => 2, :assigned_to_id => 3 },
                      :notes => 'Assigned to dlopper'
                 assert_redirected_to 'issues/show/1'
                 issue.reload
                 assert_equal 2, issue.status_id
                 j = issue.journals.find(:first, :order => 'id DESC')
                 assert_equal 'Assigned to dlopper', j.notes
                 assert_equal 2, j.details.size
                 mail = ActionMailer::Base.deliveries.last
                 assert mail.body.include?("Status changed from New to Assigned")
               end
               def test_update_with_note_only
                 notes = 'Note added by IssuesControllerTest#test_update_with_note_only'
                 # anonymous user
                 post :update,
                      :id => 1,
                      :notes => notes
                 assert_redirected_to 'issues/show/1'
                 j = Issue.find(1).journals.find(:first, :order => 'id DESC')
                 assert_equal notes, j.notes
                 assert_equal 0, j.details.size
                 assert_equal User.anonymous, j.user
                 mail = ActionMailer::Base.deliveries.last
                 assert mail.body.include?(notes)
               end
               def test_update_with_note_and_spent_time
                 @request.session[:user_id] = 2
                 spent_hours_before = Issue.find(1).spent_hours
                 post :update,
                      :id => 1,
                      :notes => '2.5 hours added',
                      :time_entry => { :hours => '2.5', :comments => '', :activity_id => Enumeration.get_values('ACTI').first }
                 assert_redirected_to 'issues/show/1'
                 issue = Issue.find(1)
                 j = issue.journals.find(:first, :order => 'id DESC')
                 assert_equal '2.5 hours added', j.notes
                 assert_equal 0, j.details.size
                 t = issue.time_entries.find(:first, :order => 'id DESC')
                 assert_not_nil t
                 assert_equal 2.5, t.hours
                 assert_equal spent_hours_before + 2.5, issue.spent_hours
               end
               def test_update_with_attachment_only
                 # anonymous user
                 post :update,
                      :id => 1,
                      :notes => '',
                      :attachments => [ test_uploaded_file('testfile.txt', 'text/plain') ]
                 assert_redirected_to 'issues/show/1'
                 j = Issue.find(1).journals.find(:first, :order => 'id DESC')
                 assert j.notes.blank?
                 assert_equal 1, j.details.size
                 assert_equal 'testfile.txt', j.details.first.value
                 assert_equal User.anonymous, j.user
                 mail = ActionMailer::Base.deliveries.last
                 assert mail.body.include?('testfile.txt')
               end
               def test_update_with_no_change
                 issue = Issue.find(1)
                 issue.journals.clear
                 ActionMailer::Base.deliveries.clear
                 post :update,
                      :id => 1,
                      :notes => ''
                 assert_redirected_to 'issues/show/1'
                 issue.reload
                 assert issue.journals.empty?
                 # No email should be sent
                 assert ActionMailer::Base.deliveries.empty?
               end
               def test_context_menu
                 @request.session[:user_id] = 2
                 get :context_menu, :id => 1
                 assert_response :success
                 assert_template 'context_menu'
               end
               def test_destroy
                 @request.session[:user_id] = 2
                 post :destroy, :id => 1
                 assert_redirected_to 'projects/ecookbook/issues'
                 assert_nil Issue.find_by_id(1)
               end
               def test_destroy_attachment
                 issue = Issue.find(3)
                 a = issue.attachments.size
                 @request.session[:user_id] = 2
                 post :destroy_attachment, :id => 3, :attachment_id => 1
                 assert_redirected_to 'issues/show/3'
                 assert_nil Attachment.find_by_id(1)
                 issue.reload
                 assert_equal((a-1), issue.attachments.size)
                 j = issue.journals.find(:first, :order => 'created_on DESC')
                 assert_equal 'attachment', j.details.first.property
               end
             end

test/functional/projects_controller_test.rb 0 -19

             # 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 File.dirname(__FILE__) + '/../test_helper'
             require 'projects_controller'
             # Re-raise errors caught by the controller.
             class ProjectsController; def rescue_action(e) raise e end; end
             class ProjectsControllerTest < Test::Unit::TestCase
               fixtures :projects, :versions, :users, :roles, :members, :issues, :journals, :journal_details, :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations
               def setup
                 @controller = ProjectsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
               end
               def test_index
                 get :index
                 assert_response :success
                 assert_template 'list'
               end
               def test_list
                 get :list
                 assert_response :success
                 assert_template 'list'
                 assert_not_nil assigns(:project_tree)
                 # Root project as hash key
                 assert assigns(:project_tree).has_key?(Project.find(1))
                 # Subproject in corresponding value
                 assert assigns(:project_tree)[Project.find(1)].include?(Project.find(3))
               end
               def test_show_by_id
                 get :show, :id => 1
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:project)
               end
               def test_show_by_identifier
                 get :show, :id => 'ecookbook'
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:project)
                 assert_equal Project.find_by_identifier('ecookbook'), assigns(:project)
               end
               def test_settings
                 @request.session[:user_id] = 2 # manager
                 get :settings, :id => 1
                 assert_response :success
                 assert_template 'settings'
               end
               def test_edit
                 @request.session[:user_id] = 2 # manager
                 post :edit, :id => 1, :project => {:name => 'Test changed name'}
                 assert_redirected_to 'projects/settings/ecookbook'
                 project = Project.find(1)
                 assert_equal 'Test changed name', project.name
               end
               def test_get_destroy
                 @request.session[:user_id] = 1 # admin
                 get :destroy, :id => 1
                 assert_response :success
                 assert_template 'destroy'
                 assert_not_nil Project.find_by_id(1)
               end
               def test_post_destroy
                 @request.session[:user_id] = 1 # admin
                 post :destroy, :id => 1, :confirm => 1
                 assert_redirected_to 'admin/projects'
                 assert_nil Project.find_by_id(1)
               end
               def test_bulk_edit_issues
                 @request.session[:user_id] = 2
                 # update issues priority
                 post :bulk_edit_issues, :id => 1, :issue_ids => [1, 2], :priority_id => 7, :notes => 'Bulk editing', :assigned_to_id => ''
                 assert_response 302
                 # check that the issues were updated
                 assert_equal [7, 7], Issue.find_all_by_id([1, 2]).collect {|i| i.priority.id}
                 assert_equal 'Bulk editing', Issue.find(1).journals.find(:first, :order => 'created_on DESC').notes
               end
               def test_move_issues_to_another_project
                 @request.session[:user_id] = 1
                 post :move_issues, :id => 1, :issue_ids => [1, 2], :new_project_id => 2
                 assert_redirected_to 'projects/ecookbook/issues'
                 assert_equal 2, Issue.find(1).project_id
                 assert_equal 2, Issue.find(2).project_id
               end
               def test_move_issues_to_another_tracker
                 @request.session[:user_id] = 1
                 post :move_issues, :id => 1, :issue_ids => [1, 2], :new_tracker_id => 2
                 assert_redirected_to 'projects/ecookbook/issues'
                 assert_equal 2, Issue.find(1).tracker_id
                 assert_equal 2, Issue.find(2).tracker_id
               end
               def test_list_files
                 get :list_files, :id => 1
                 assert_response :success
                 assert_template 'list_files'
                 assert_not_nil assigns(:versions)
               end
               def test_changelog
                 get :changelog, :id => 1
                 assert_response :success
                 assert_template 'changelog'
                 assert_not_nil assigns(:versions)
               end
               def test_roadmap
                 get :roadmap, :id => 1
                 assert_response :success
                 assert_template 'roadmap'
                 assert_not_nil assigns(:versions)
                 # Version with no date set appears
                 assert assigns(:versions).include?(Version.find(3))
                 # Completed version doesn't appear
                 assert !assigns(:versions).include?(Version.find(1))
               end
               def test_roadmap_with_completed_versions
                 get :roadmap, :id => 1, :completed => 1
                 assert_response :success
                 assert_template 'roadmap'
                 assert_not_nil assigns(:versions)
                 # Version with no date set appears
                 assert assigns(:versions).include?(Version.find(3))
                 # Completed version appears
                 assert assigns(:versions).include?(Version.find(1))
               end
               def test_activity
                 get :activity, :id => 1, :year => 2.days.ago.to_date.year, :month => 2.days.ago.to_date.month
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events_by_day)
                 assert_tag :tag => "h3",
                            :content => /#{2.days.ago.to_date.day}/,
                            :sibling => { :tag => "ul",
                              :child => { :tag => "li",
                                :child => { :tag => "p",
                                  :content => /(#{IssueStatus.find(2).name})/,
                                }
                              }
                            }
                 get :activity, :id => 1, :year => 3.days.ago.to_date.year, :month => 3.days.ago.to_date.month
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events_by_day)
                 assert_tag :tag => "h3",
                            :content => /#{3.day.ago.to_date.day}/,
                            :sibling => { :tag => "ul",
                              :child => { :tag => "li",
                                :child => { :tag => "p",
                                  :content => /#{Issue.find(1).subject}/,
                                }
                              }
                            }
               end
               def test_calendar
                 get :calendar, :id => 1
                 assert_response :success
                 assert_template 'calendar'
                 assert_not_nil assigns(:calendar)
               end
               def test_calendar_with_subprojects
                 get :calendar, :id => 1, :with_subprojects => 1, :tracker_ids => [1, 2]
                 assert_response :success
                 assert_template 'calendar'
                 assert_not_nil assigns(:calendar)
               end
               def test_gantt
                 get :gantt, :id => 1
                 assert_response :success
                 assert_template 'gantt.rhtml'
                 assert_not_nil assigns(:events)
               end
               def test_gantt_with_subprojects
                 get :gantt, :id => 1, :with_subprojects => 1, :tracker_ids => [1, 2]
                 assert_response :success
                 assert_template 'gantt.rhtml'
                 assert_not_nil assigns(:events)
               end
               def test_gantt_export_to_pdf
                 get :gantt, :id => 1, :format => 'pdf'
                 assert_response :success
                 assert_template 'gantt.rfpdf'
                 assert_equal 'application/pdf', @response.content_type
                 assert_not_nil assigns(:events)
               end
               def test_archive
                 @request.session[:user_id] = 1 # admin
                 post :archive, :id => 1
                 assert_redirected_to 'admin/projects'
                 assert !Project.find(1).active?
               end
               def test_unarchive
                 @request.session[:user_id] = 1 # admin
                 Project.find(1).archive
                 post :unarchive, :id => 1
                 assert_redirected_to 'admin/projects'
                 assert Project.find(1).active?
               end
-              def test_add_issue
-                @request.session[:user_id] = 2
-                get :add_issue, :id => 1, :tracker_id => 1
-                assert_response :success
-                assert_template 'add_issue'
-                post :add_issue, :id => 1, :issue => {:tracker_id => 1, :subject => 'This is the test_add_issue issue', :description => 'This is the description', :priority_id => 5}
-                assert_redirected_to 'projects/ecookbook/issues'
-                assert Issue.find_by_subject('This is the test_add_issue issue')
-              end
-              def test_copy_issue
-                @request.session[:user_id] = 2
-                get :add_issue, :id => 1, :copy_from => 1
-                assert_template 'add_issue'
-                assert_not_nil assigns(:issue)
-                orig = Issue.find(1)
-                assert_equal orig.subject, assigns(:issue).subject
-              end
             end

test/integration/issues_test.rb +3 -3

             require "#{File.dirname(__FILE__)}/../test_helper"
             class IssuesTest < ActionController::IntegrationTest
               fixtures :projects, :users, :trackers, :issue_statuses, :issues,  :enumerations
               # create an issue
               def test_add_issue
                 log_user('jsmith', 'jsmith')
-                get "projects/add_issue/1", :tracker_id => "1"
+                get 'projects/1/issues/new', :tracker_id => '1'
                 assert_response :success
-                assert_template "projects/add_issue"
+                assert_template 'issues/new'
-                post "projects/add_issue/1", :tracker_id => "1",
+                post 'projects/1/issues/new', :tracker_id => "1",
                                              :issue => { :start_date => "2006-12-26",
                                                          :priority_id => "3",
                                                          :subject => "new test issue",
                                                          :category_id => "",
                                                          :description => "new issue",
                                                          :done_ratio => "0",
                                                          :due_date => "",
                                                          :assigned_to_id => "" }
                 # find created issue
                 issue = Issue.find_by_subject("new test issue")
                 assert_kind_of Issue, issue
                 # check redirection
                 assert_redirected_to "projects/ecookbook/issues"
                 follow_redirect!
                 assert assigns(:issues).include?(issue)
                 # check issue attributes
                 assert_equal 'jsmith', issue.author.login
                 assert_equal 1, issue.project.id
                 assert_equal 1, issue.status.id
               end
               # add then remove 2 attachments to an issue
               def test_issue_attachements
                 log_user('jsmith', 'jsmith')
                 post 'issues/update/1',
                      :notes => 'Some notes',
                      :attachments => ([] << ActionController::TestUploadedFile.new(Test::Unit::TestCase.fixture_path + '/files/testfile.txt', 'text/plain'))
                 assert_redirected_to "issues/show/1"
                 # make sure attachment was saved
                 attachment = Issue.find(1).attachments.find_by_filename("testfile.txt")
                 assert_kind_of Attachment, attachment
                 assert_equal Issue.find(1), attachment.container
                 # verify the size of the attachment stored in db
                 #assert_equal file_data_1.length, attachment.filesize
                 # verify that the attachment was written to disk
                 assert File.exist?(attachment.diskfile)
                 # remove the attachments
                 Issue.find(1).attachments.each(&:destroy)
                 assert_equal 0, Issue.find(1).attachments.length
               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