jro_apps/redmine Commit - r1441:a92749ef93bb

Gantt chart: display issues that don't have a due date if they are assigned to a version with a date (#184)....

Jean-Philippe Lang -

r1441:a92749ef93bb

parent child

Context file:

r1441:a92749ef93bb

Collapse all files

app/controllers/projects_controller.rb +7 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.
             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 => [:changelog]
               before_filter :find_project, :except => [ :index, :list, :add, :activity ]
               before_filter :find_optional_project, :only => :activity
               before_filter :authorize, :except => [ :index, :list, :add, :archive, :unarchive, :destroy, :activity ]
               before_filter :require_admin, :only => [ :add, :archive, :unarchive, :destroy ]
               accept_key_auth :activity, :calendar
               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])
                 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
                   @project.is_public = Setting.default_projects_public?
                   @project.enabled_module_names = Redmine::AccessControl.available_project_modules
                 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
                   @project.enabled_module_names = params[:enabled_modules]
                   if @project.save
                     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.children.find(:all, :conditions => Project.visible_by(User.current))
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
                 @trackers = @project.rolled_up_trackers
                 cond = @project.project_condition(Setting.display_subprojects_issues?)
                 Issue.visible_by(User.current) do
                   @open_issues_by_tracker = Issue.count(:group => :tracker,
                                                         :include => [:project, :status, :tracker],
                                                         :conditions => ["(#{cond}) AND #{IssueStatus.table_name}.is_closed=?", false])
                   @total_issues_by_tracker = Issue.count(:group => :tracker,
                                                         :include => [:project, :status, :tracker],
                                                         :conditions => cond)
                 end
                 TimeEntry.visible_by(User.current) do
                   @total_hours = TimeEntry.sum(:hours,
                                                :include => :project,
                                                :conditions => cond).to_f
                 end
                 @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?
                   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
               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
                 sort_init "#{Attachment.table_name}.filename", "asc"
                 sort_update
                 @versions = @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
                 render :layout => !request.xhr?
               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
                 @days = Setting.activity_days_default.to_i
                 if params[:from]
                   begin; @date_to = params[:from].to_date; rescue; end
                 end
                 @date_to ||= Date.today + 1
                 @date_from = @date_to - @days
                 @event_types = %w(issues news files documents changesets wiki_pages messages)
                 if @project
                   @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)}
                   @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
                 end
                 @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')
                   cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_issues, :project => @project, :with_subprojects => @with_subprojects))
                   cond.add(["#{Issue.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
                   @events += Issue.find(:all, :include => [:project, :author, :tracker], :conditions => cond.conditions)
                   cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_issues, :project => @project, :with_subprojects => @with_subprojects))
                   cond.add(["#{Journal.table_name}.journalized_type = 'Issue' AND #{JournalDetail.table_name}.prop_key = 'status_id' AND #{Journal.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
                   @events += Journal.find(:all, :include => [{:issue => :project}, :details, :user], :conditions => cond.conditions)
                 end
                 if @scope.include?('news')
                   cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_news, :project => @project, :with_subprojects => @with_subprojects))
                   cond.add(["#{News.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
                   @events += News.find(:all, :include => [:project, :author], :conditions => cond.conditions)
                 end
                 if @scope.include?('files')
                   cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_files, :project => @project, :with_subprojects => @with_subprojects))
                   cond.add(["#{Attachment.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
                   @events += Attachment.find(:all, :select => "#{Attachment.table_name}.*",
                                                    :joins => "LEFT JOIN #{Version.table_name} ON #{Attachment.table_name}.container_type='Version' AND #{Version.table_name}.id = #{Attachment.table_name}.container_id " +
                                                              "LEFT JOIN #{Project.table_name} ON #{Version.table_name}.project_id = #{Project.table_name}.id",
                                                    :conditions => cond.conditions)
                 end
                 if @scope.include?('documents')
                   cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_documents, :project => @project, :with_subprojects => @with_subprojects))
                   cond.add(["#{Document.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
                   @events += Document.find(:all, :include => :project, :conditions => cond.conditions)
                   cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_documents, :project => @project, :with_subprojects => @with_subprojects))
                   cond.add(["#{Attachment.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
                   @events += Attachment.find(:all, :select => "#{Attachment.table_name}.*",
                                                    :joins => "LEFT JOIN #{Document.table_name} ON #{Attachment.table_name}.container_type='Document' AND #{Document.table_name}.id = #{Attachment.table_name}.container_id " +
                                                              "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id",
                                                    :conditions => cond.conditions)
                 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 " +
                           "LEFT JOIN #{Project.table_name} ON #{Project.table_name}.id = #{Wiki.table_name}.project_id"
                   cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_wiki_pages, :project => @project, :with_subprojects => @with_subprojects))
                   cond.add(["#{WikiContent.versioned_table_name}.updated_on BETWEEN ? AND ?", @date_from, @date_to])
                   @events += WikiContent.versioned_class.find(:all, :select => select, :joins => joins, :conditions => cond.conditions)
                 end
                 if @scope.include?('changesets')
                   cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_changesets, :project => @project, :with_subprojects => @with_subprojects))
                   cond.add(["#{Changeset.table_name}.committed_on BETWEEN ? AND ?", @date_from, @date_to])
                   @events += Changeset.find(:all, :include => {:repository => :project}, :conditions => cond.conditions)
                 end
                 if @scope.include?('messages')
                   cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_messages, :project => @project, :with_subprojects => @with_subprojects))
                   cond.add(["#{Message.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
                   @events += Message.find(:all, :include => [{:board => :project}, :author], :conditions => cond.conditions)
                 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 || Setting.app_title}: #{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)
                 @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
                 events = []
                 @project.issues_with_subprojects(@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?
                   events += Version.find(:all, :include => :project,
                                                :conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
                 end
                 @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
                 @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
                 @events = []
                 @project.issues_with_subprojects(@with_subprojects) do
+                  # Issues that have start and due dates
                   @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?
+                  # Issues that don't have a due date but that are assigned to a version with a date
+                  @events += Issue.find(:all,
+                                       :order => "start_date, effective_date",
+                                       :include => [:tracker, :status, :assigned_to, :priority, :project, :fixed_version],
+                                       :conditions => ["(((start_date>=? and start_date<=?) or (effective_date>=? and effective_date<=?) or (start_date<? and effective_date>?)) and start_date is not null and due_date is null and effective_date is not null 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?
                   @events += Version.find(:all, :include => :project,
                                                 :conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to])
                 end
                 @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 find_optional_project
                 return true unless params[:id]
                 @project = Project.find(params[:id])
                 authorize
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def retrieve_selected_tracker_ids(selectable_trackers)
                 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/models/issue.rb +6 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.
             class Issue < ActiveRecord::Base
               belongs_to :project
               belongs_to :tracker
               belongs_to :status, :class_name => 'IssueStatus', :foreign_key => 'status_id'
               belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
               belongs_to :assigned_to, :class_name => 'User', :foreign_key => 'assigned_to_id'
               belongs_to :fixed_version, :class_name => 'Version', :foreign_key => 'fixed_version_id'
               belongs_to :priority, :class_name => 'Enumeration', :foreign_key => 'priority_id'
               belongs_to :category, :class_name => 'IssueCategory', :foreign_key => 'category_id'
               has_many :journals, :as => :journalized, :dependent => :destroy
               has_many :attachments, :as => :container, :dependent => :destroy
               has_many :time_entries, :dependent => :delete_all
               has_many :custom_values, :dependent => :delete_all, :as => :customized
               has_many :custom_fields, :through => :custom_values
               has_and_belongs_to_many :changesets, :order => "revision ASC"
               has_many :relations_from, :class_name => 'IssueRelation', :foreign_key => 'issue_from_id', :dependent => :delete_all
               has_many :relations_to, :class_name => 'IssueRelation', :foreign_key => 'issue_to_id', :dependent => :delete_all
               acts_as_watchable
               acts_as_searchable :columns => ['subject', "#{table_name}.description"], :include => :project, :with => {:journal => :issue}
               acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id}: #{o.subject}"},
                             :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.id}}
               validates_presence_of :subject, :description, :priority, :project, :tracker, :author, :status
               validates_length_of :subject, :maximum => 255
               validates_inclusion_of :done_ratio, :in => 0..100
               validates_numericality_of :estimated_hours, :allow_nil => true
               validates_associated :custom_values, :on => :update
               def after_initialize
                 if new_record?
                   # set default values for new records only
                   self.status ||= IssueStatus.default
                   self.priority ||= Enumeration.default('IPRI')
                 end
               end
               def copy_from(arg)
                 issue = arg.is_a?(Issue) ? arg : Issue.find(arg)
                 self.attributes = issue.attributes.dup
                 self.custom_values = issue.custom_values.collect {|v| v.clone}
                 self
               end
               # Move an issue to a new project and tracker
               def move_to(new_project, new_tracker = nil)
                 transaction do
                   if new_project && project_id != new_project.id
                     # delete issue relations
                     unless Setting.cross_project_issue_relations?
                       self.relations_from.clear
                       self.relations_to.clear
                     end
                     # issue is moved to another project
                     self.category = nil
                     self.fixed_version = nil
                     self.project = new_project
                   end
                   if new_tracker
                     self.tracker = new_tracker
                   end
                   if save
                     # Manually update project_id on related time entries
                     TimeEntry.update_all("project_id = #{new_project.id}", {:issue_id => id})
                   else
                     rollback_db_transaction
                     return false
                   end
                 end
                 return true
               end
               def priority_id=(pid)
                 self.priority = nil
                 write_attribute(:priority_id, pid)
               end
               def estimated_hours=(h)
                 write_attribute :estimated_hours, (h.is_a?(String) ? h.to_hours : h)
               end
               def validate
                 if self.due_date.nil? && @attributes['due_date'] && !@attributes['due_date'].empty?
                   errors.add :due_date, :activerecord_error_not_a_date
                 end
                 if self.due_date and self.start_date and self.due_date < self.start_date
                   errors.add :due_date, :activerecord_error_greater_than_start_date
                 end
                 if start_date && soonest_start && start_date < soonest_start
                   errors.add :start_date, :activerecord_error_invalid
                 end
               end
               def validate_on_create
                 errors.add :tracker_id, :activerecord_error_invalid unless project.trackers.include?(tracker)
               end
               def before_create
                 # default assignment based on category
                 if assigned_to.nil? && category && category.assigned_to
                   self.assigned_to = category.assigned_to
                 end
               end
               def before_save
                 if @current_journal
                   # attributes changes
                   (Issue.column_names - %w(id description)).each {|c|
                     @current_journal.details << JournalDetail.new(:property => 'attr',
                                                                   :prop_key => c,
                                                                   :old_value => @issue_before_change.send(c),
                                                                   :value => send(c)) unless send(c)==@issue_before_change.send(c)
                   }
                   # custom fields changes
                   custom_values.each {|c|
                     next if (@custom_values_before_change[c.custom_field_id]==c.value ||
                               (@custom_values_before_change[c.custom_field_id].blank? && c.value.blank?))
                     @current_journal.details << JournalDetail.new(:property => 'cf',
                                                                   :prop_key => c.custom_field_id,
                                                                   :old_value => @custom_values_before_change[c.custom_field_id],
                                                                   :value => c.value)
                   }
                   @current_journal.save
                 end
                 # Save the issue even if the journal is not saved (because empty)
                 true
               end
               def after_save
                 # Reload is needed in order to get the right status
                 reload
                 # Update start/due dates of following issues
                 relations_from.each(&:set_issue_to_dates)
                 # Close duplicates if the issue was closed
                 if @issue_before_change && !@issue_before_change.closed? && self.closed?
                   duplicates.each do |duplicate|
                     # Reload is need in case the duplicate was updated by a previous duplicate
                     duplicate.reload
                     # Don't re-close it if it's already closed
                     next if duplicate.closed?
                     # Same user and notes
                     duplicate.init_journal(@current_journal.user, @current_journal.notes)
                     duplicate.update_attribute :status, self.status
                   end
                 end
               end
               def custom_value_for(custom_field)
                 self.custom_values.each {|v| return v if v.custom_field_id == custom_field.id }
                 return nil
               end
               def init_journal(user, notes = "")
                 @current_journal ||= Journal.new(:journalized => self, :user => user, :notes => notes)
                 @issue_before_change = self.clone
                 @issue_before_change.status = self.status
                 @custom_values_before_change = {}
                 self.custom_values.each {|c| @custom_values_before_change.store c.custom_field_id, c.value }
                 @current_journal
               end
               # Return true if the issue is closed, otherwise false
               def closed?
                 self.status.is_closed?
               end
               # Users the issue can be assigned to
               def assignable_users
                 project.assignable_users
               end
               # Returns an array of status that user is able to apply
               def new_statuses_allowed_to(user)
                 statuses = status.find_new_statuses_allowed_to(user.role_for_project(project), tracker)
                 statuses << status unless statuses.empty?
                 statuses.uniq.sort
               end
               # Returns the mail adresses of users that should be notified for the issue
               def recipients
                 recipients = project.recipients
                 # Author and assignee are always notified unless they have been locked
                 recipients << author.mail if author && author.active?
                 recipients << assigned_to.mail if assigned_to && assigned_to.active?
                 recipients.compact.uniq
               end
               def spent_hours
                 @spent_hours ||= time_entries.sum(:hours) || 0
               end
               def relations
                 (relations_from + relations_to).sort
               end
               def all_dependent_issues
                 dependencies = []
                 relations_from.each do |relation|
                   dependencies << relation.issue_to
                   dependencies += relation.issue_to.all_dependent_issues
                 end
                 dependencies
               end
               # Returns an array of the duplicate issues
               def duplicates
                 relations.select {|r| r.relation_type == IssueRelation::TYPE_DUPLICATES}.collect {|r| r.other_issue(self)}
               end
+              # Returns the due date or the target due date if any
+              # Used on gantt chart
+              def due_before
+                due_date || (fixed_version ? fixed_version.effective_date : nil)
+              end
               def duration
                 (start_date && due_date) ? due_date - start_date : 0
               end
               def soonest_start
                 @soonest_start ||= relations_to.collect{|relation| relation.successor_soonest_start}.compact.min
               end
               def self.visible_by(usr)
                 with_scope(:find => { :conditions => Project.visible_by(usr) }) do
                   yield
                 end
               end
               def to_s
                 "#{tracker} ##{id}: #{subject}"
               end
             end

app/views/projects/gantt.rfpdf +2 -2

             <%
             pdf=IfpdfHelper::IFPDF.new(current_language)
             pdf.SetTitle("#{@project.name} - #{l(:label_gantt)}")
             pdf.AliasNbPages
             pdf.footer_date = format_date(Date.today)
             pdf.AddPage("L")
             pdf.SetFontStyle('B',12)
             pdf.SetX(15)
             pdf.Cell(70, 20, @project.name)
             pdf.Ln
             pdf.SetFontStyle('B',9)
             subject_width = 70
             header_heigth = 5
             headers_heigth = header_heigth
             show_weeks = false
             show_days = false
             if @months < 7
                 show_weeks = true
                 headers_heigth = 2*header_heigth
                 if @months < 3
                     show_days = true
                     headers_heigth = 3*header_heigth
                 end
             end
             g_width = 210
             zoom = (g_width) / (@date_to - @date_from + 1)
             g_height = 120
             t_height = g_height + headers_heigth
             y_start = pdf.GetY
             #
             # Months headers
             #
             month_f = @date_from
             left = subject_width
             height = header_heigth
             @months.times do
             	width = ((month_f >> 1) - month_f) * zoom
             	pdf.SetY(y_start)
             	pdf.SetX(left)
             	pdf.Cell(width, height, "#{month_f.year}-#{month_f.month}", "LTR", 0, "C")
             	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-1
             		pdf.SetY(y_start + header_heigth)
             		pdf.SetX(left)
             		pdf.Cell(width + 1, height, "", "LTR")
             		left = left + width+1
             	end
             	while week_f <= @date_to
             		width = (week_f + 6 <= @date_to) ? 7 * zoom : (@date_to - week_f + 1) * zoom
             		pdf.SetY(y_start + header_heigth)
             		pdf.SetX(left)
             		pdf.Cell(width, height, (width >= 5 ? week_f.cweek.to_s : ""), "LTR", 0, "C")
             		left = left + width
             		week_f = week_f+7
             	end
             end
             #
             # Days headers
             #
             if show_days
             	left = subject_width
             	height = header_heigth
             	wday = @date_from.cwday
             	pdf.SetFontStyle('B',7)
             	(@date_to - @date_from + 1).to_i.times do
             		width = zoom
             		pdf.SetY(y_start + 2 * header_heigth)
             		pdf.SetX(left)
             		pdf.Cell(width, height, day_name(wday).first, "LTR", 0, "C")
             		left = left + width
             		wday = wday + 1
             		wday = 1 if wday > 7
             	end
             end
             pdf.SetY(y_start)
             pdf.SetX(15)
             pdf.Cell(subject_width+g_width-15, headers_heigth, "", 1)
             #
             # Tasks
             #
             top = headers_heigth + y_start
             pdf.SetFontStyle('B',7)
             @events.each do |i|
             	pdf.SetY(top)
             	pdf.SetX(15)
             	if i.is_a? Issue
             		pdf.Cell(subject_width-15, 5, "#{i.tracker.name} #{i.id}: #{i.subject}".sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)'), "LR")
             	else
             		pdf.Cell(subject_width-15, 5, "#{l(:label_version)}: #{i.name}", "LR")
             	end
             	pdf.SetY(top)
             	pdf.SetX(subject_width)
             	pdf.Cell(g_width, 5, "", "LR")
             	pdf.SetY(top+1.5)
             	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_end_date = (i.due_before <= @date_to ? i.due_before : @date_to )
-            		i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor
+            		i_done_date = i.start_date + ((i.due_before - 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 = ((i_start_date - @date_from)*zoom)
             		i_width = ((i_end_date - i_start_date + 1)*zoom)
             		d_width = ((i_done_date - i_start_date)*zoom)
             		l_width = ((i_late_date - i_start_date+1)*zoom) if i_late_date
             		l_width ||= 0
             		pdf.SetX(subject_width + i_left)
             		pdf.SetFillColor(200,200,200)
             		pdf.Cell(i_width, 2, "", 0, 0, "", 1)
             		if l_width > 0
             			pdf.SetY(top+1.5)
             			pdf.SetX(subject_width + i_left)
             			pdf.SetFillColor(255,100,100)
             			pdf.Cell(l_width, 2, "", 0, 0, "", 1)
             		end
             		if d_width > 0
             			pdf.SetY(top+1.5)
             			pdf.SetX(subject_width + i_left)
             			pdf.SetFillColor(100,100,255)
             			pdf.Cell(d_width, 2, "", 0, 0, "", 1)
             		end
             		pdf.SetY(top+1.5)
             		pdf.SetX(subject_width + i_left + i_width)
             		pdf.Cell(30, 2, "#{i.status.name} #{i.done_ratio}%")
             	else
             		i_left = ((i.start_date - @date_from)*zoom)
             		pdf.SetX(subject_width + i_left)
             		pdf.SetFillColor(50,200,50)
             		pdf.Cell(2, 2, "", 0, 0, "", 1)
             		pdf.SetY(top+1.5)
             		pdf.SetX(subject_width + i_left + 3)
             		pdf.Cell(30, 2, "#{i.name}")
             	end
             	top = top + 5
             	pdf.SetDrawColor(200, 200, 200)
             	pdf.Line(15, top, subject_width+g_width, top)
             	if pdf.GetY() > 180
             		pdf.AddPage("L")
             		top = 20
             		pdf.Line(15, top, subject_width+g_width, top)
             	end
             	pdf.SetDrawColor(0, 0, 0)
             end
             pdf.Line(15, top, subject_width+g_width, top)
             %>
             <%= pdf.Output %>

app/views/projects/gantt.rhtml +2 -2

             <% zoom = 1
             @zoom.times { zoom = zoom * 2 }
             subject_width = 330
             header_heigth = 18
             headers_height = header_heigth
             show_weeks = false
             show_days = false
             if @zoom >1
                 show_weeks = true
                 headers_height = 2*header_heigth
                 if @zoom > 2
                     show_days = true
                     headers_height = 3*header_heigth
                 end
             end
             g_width = (@date_to - @date_from + 1)*zoom
             g_height = [(20 * @events.length + 6)+150, 206].max
             t_height = g_height + headers_height
             %>
             <div class="contextual">
             </div>
             <h2><%= l(:label_gantt) %></h2>
             <% form_tag(params.merge(:month => nil, :year => nil, :months => nil)) do %>
             <table width="100%">
             <tr>
             <td align="left">
                 <input type="text" name="months" size="2" value="<%= @months %>" />
                 <%= l(:label_months_from) %>
                 <%= select_month(@month_from, :prefix => "month", :discard_type => true) %>
                 <%= select_year(@year_from, :prefix => "year", :discard_type => true) %>
                 <%= hidden_field_tag 'zoom', @zoom %>
                 <%= submit_tag l(:button_submit), :class => "button-small" %>
             </td>
             <td align="right">
             <%= if @zoom < 4
                 link_to image_tag('zoom_in.png'), {:zoom => (@zoom+1), :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects]}
               else
                 image_tag 'zoom_in_g.png'
               end %>
             <%= if @zoom > 1
                 link_to image_tag('zoom_out.png'),{:zoom => (@zoom-1), :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects]}
               else
                 image_tag 'zoom_out_g.png'
               end %>
             </td>
             </tr>
             </table>
             <% end %>
             <table width="100%" style="border:0; border-collapse: collapse;">
             <tr>
             <td style="width:<%= subject_width %>px;">
             <div style="position:relative;height:<%= t_height + 24 %>px;width:<%= subject_width + 1 %>px;">
             <div style="right:-2px;width:<%= subject_width %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr"></div>
             <div style="right:-2px;width:<%= subject_width %>px;height:<%= t_height %>px;border-left: 1px solid #c0c0c0;overflow:hidden;" class="gantt_hdr"></div>
             <%
             #
             # Tasks subjects
             #
             top = headers_height + 8
             @events.each do |i| %>
                 <div style="position: absolute;line-height:1.2em;height:16px;top:<%= top %>px;left:4px;overflow:hidden;"><small>
                 <% if i.is_a? Issue %>
                   	<%= h("#{i.project} -") unless @project && @project == i.project %>
                   	<%= link_to_issue i %>:	<%=h i.subject %>
               	<% else %>
             		<span class="icon icon-package">
             	      	<%= h("#{i.project} -") unless @project && @project == i.project %>
             	      	<%= link_to_version i %>
             		</span>
               	<% end %>
               	</small></div>
                 <% top = top + 20
             end %>
             </div>
             </td>
             <td>
             <div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;">
             <div style="width:<%= g_width-1 %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr">&nbsp;</div>
             <%
             #
             # Months headers
             #
             month_f = @date_from
             left = 0
             height = (show_weeks ? header_heigth : header_heigth + g_height)
             @months.times do
             	width = ((month_f >> 1) - month_f) * zoom - 1
             	%>
             	<div style="left:<%= left %>px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
             	<%= link_to "#{month_f.year}-#{month_f.month}", { :year => month_f.year, :month => month_f.month, :zoom => @zoom, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects] }, :title => "#{month_name(month_f.month)} #{month_f.year}"%>
             	</div>
             	<%
             	left = left + width + 1
             	month_f = month_f >> 1
             end %>
             <%
             #
             # Weeks headers
             #
             if show_weeks
             	left = 0
             	height = (show_days ? header_heigth-1 : header_heigth-1 + g_height)
             	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-1
             		%>
             		<div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">&nbsp;</div>
             		<%
             		left = left + width+1
             	end %>
             	<%
             	while week_f <= @date_to
             		width = (week_f + 6 <= @date_to) ? 7 * zoom -1 : (@date_to - week_f + 1) * zoom-1
             		%>
             		<div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
             		<small><%= week_f.cweek if width >= 16 %></small>
             		</div>
             		<%
             		left = left + width+1
             		week_f = week_f+7
             	end
             end %>
             <%
             #
             # Days headers
             #
             if show_days
             	left = 0
             	height = g_height + header_heigth - 1
             	wday = @date_from.cwday
             	(@date_to - @date_from + 1).to_i.times do
             	width =  zoom - 1
             	%>
             	<div style="left:<%= left %>px;top:37px;width:<%= width %>px;height:<%= height %>px;font-size:0.7em;<%= "background:#f1f1f1;" if wday > 5 %>" class="gantt_hdr">
             	<%= day_name(wday).first %>
             	</div>
             	<%
             	left = left + width+1
             	wday = wday + 1
             	wday = 1 if wday > 7
             	end
             end %>
             <%
             #
             # Tasks
             #
             top = headers_height + 10
             @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_end_date = (i.due_before <= @date_to ? i.due_before : @date_to )
-            	i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor
+            	i_done_date = i.start_date + ((i.due_before - 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 = ((i_start_date - @date_from)*zoom).floor
             	i_width = ((i_end_date - i_start_date + 1)*zoom).floor - 2                  # total width of the issue (- 2 for left and right borders)
             	d_width = ((i_done_date - i_start_date)*zoom).floor - 2                     # done width
             	l_width = i_late_date ? ((i_late_date - i_start_date+1)*zoom).floor - 2 : 0 # delay width
             	%>
             	<div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;" class="task task_todo">&nbsp;</div>
             	<% if l_width > 0 %>
             	    <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= l_width %>px;" class="task task_late">&nbsp;</div>
             	<% end %>
             	<% if d_width > 0 %>
             	    <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= d_width %>px;" class="task task_done">&nbsp;</div>
             	<% end %>
             	<div style="top:<%= top %>px;left:<%= i_left + i_width + 5 %>px;background:#fff;" class="task">
             	<%= i.status.name %>
             	<%= (i.done_ratio).to_i %>%
             	</div>
             	<% # === tooltip === %>
             	<div class="tooltip" style="position: absolute;top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;height:12px;">
             	<span class="tip">
                 <%= render_issue_tooltip i %>
             	</span></div>
             <% else
                 i_left = ((i.start_date - @date_from)*zoom).floor
                 %>
                 <div style="top:<%= top %>px;left:<%= i_left %>px;width:15px;" class="task milestone">&nbsp;</div>
             	<div style="top:<%= top %>px;left:<%= i_left + 12 %>px;background:#fff;" class="task">
             		<%= h("#{i.project} -") unless @project && @project == i.project %>
             		<strong><%=h i %></strong>
             	</div>
             <% end %>
             	<% top = top + 20
             end %>
             <%
             #
             # Today red line (excluded from cache)
             #
             if Date.today >= @date_from and Date.today <= @date_to %>
                 <div style="position: absolute;height:<%= g_height %>px;top:<%= headers_height + 1 %>px;left:<%= ((Date.today-@date_from+1)*zoom).floor()-1 %>px;width:10px;border-left: 1px dashed red;">&nbsp;</div>
             <% end %>
             </div>
             </td>
             </tr>
             </table>
             <table width="100%">
             <tr>
             <td align="left"><%= link_to ('&#171; ' + l(:label_previous)), :year => (@date_from << @months).year, :month => (@date_from << @months).month, :zoom => @zoom, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects] %></td>
             <td align="right"><%= link_to (l(:label_next) + ' &#187;'), :year => (@date_from >> @months).year, :month => (@date_from >> @months).month, :zoom => @zoom, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects] %></td>
             </tr>
             </table>
             <p class="other-formats">
             <%= l(:label_export_to) %>
             <span><%= link_to 'PDF', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects], :format => 'pdf'}, :class => 'pdf' %></span>
             <%= content_tag('span', link_to('PNG', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects], :format => 'png'}, :class => 'image')) if respond_to?('gantt_image') %>
             </p>
             <% content_for :sidebar do %>
                 <h3><%= l(:label_gantt) %></h3>
                 <% form_tag(params.merge(:tracker_ids => nil, :with_subprojects => nil), :method => :get) do %>
                 <% @trackers.each do |tracker| %>
                   <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %> <%= tracker.name %></label><br />
                 <% end %>
                 <% if @project.active_children.any? %>
                 <br /><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label>
                 <%= hidden_field_tag 'with_subprojects', 0 %>
                 <% end %>
                 <p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
                 <% end %>
             <% end %>
             <% html_title(l(:label_gantt)) -%>

test/fixtures/issues.yml +5 -1

             ---
             issues_001:
               created_on: <%= 3.days.ago.to_date.to_s(:db) %>
               project_id: 1
               updated_on: <%= 1.day.ago.to_date.to_s(:db) %>
               priority_id: 4
               subject: Can't print recipes
               id: 1
               fixed_version_id:
               category_id: 1
               description: Unable to print recipes
               tracker_id: 1
               assigned_to_id:
               author_id: 2
               status_id: 1
+              start_date: <%= 1.day.ago.to_date.to_s(:db) %>
+              due_date: <%= 10.day.from_now.to_date.to_s(:db) %>
             issues_002:
               created_on: 2006-07-19 21:04:21 +02:00
               project_id: 1
               updated_on: 2006-07-19 21:09:50 +02:00
               priority_id: 5
               subject: Add ingredients categories
               id: 2
-              fixed_version_id:
+              fixed_version_id: 2
               category_id:
               description: Ingredients of the recipe should be classified by categories
               tracker_id: 2
               assigned_to_id: 3
               author_id: 2
               status_id: 2
+              start_date: <%= 2.day.ago.to_date.to_s(:db) %>
+              due_date:
             issues_003:
               created_on: 2006-07-19 21:07:27 +02:00
               project_id: 1
               updated_on: 2006-07-19 21:07:27 +02:00
               priority_id: 4
               subject: Error 281 when updating a recipe
               id: 3
               fixed_version_id:
               category_id:
               description: Error 281 is encountered when saving a recipe
               tracker_id: 1
               assigned_to_id:
               author_id: 2
               status_id: 1
               start_date: <%= 1.day.from_now.to_date.to_s(:db) %>
               due_date: <%= 40.day.ago.to_date.to_s(:db) %>
             issues_004:
               created_on: <%= 5.days.ago.to_date.to_s(:db) %>
               project_id: 2
               updated_on: <%= 2.days.ago.to_date.to_s(:db) %>
               priority_id: 4
               subject: Issue on project 2
               id: 4
               fixed_version_id:
               category_id:
               description: Issue on project 2
               tracker_id: 1
               assigned_to_id:
               author_id: 2
               status_id: 1
             issues_005:
               created_on: <%= 5.days.ago.to_date.to_s(:db) %>
               project_id: 3
               updated_on: <%= 2.days.ago.to_date.to_s(:db) %>
               priority_id: 4
               subject: Subproject issue
               id: 5
               fixed_version_id:
               category_id:
               description: This is an issue on a cookbook subproject
               tracker_id: 1
               assigned_to_id:
               author_id: 2
               status_id: 1
             issues_006:
               created_on: <%= 1.minute.ago.to_date.to_s(:db) %>
               project_id: 5
               updated_on: <%= 1.minute.ago.to_date.to_s(:db) %>
               priority_id: 4
               subject: Issue of a private subproject
               id: 6
               fixed_version_id:
               category_id:
               description: This is an issue of a private subproject of cookbook
               tracker_id: 1
               assigned_to_id:
               author_id: 2
               status_id: 1
               start_date: <%= Date.today.to_s(:db) %>
               due_date: <%= 1.days.from_now.to_date.to_s(:db) %>
   No newline at end of file

test/fixtures/versions.yml +1 -1

             ---
             versions_001:
               created_on: 2006-07-19 21:00:07 +02:00
               name: "0.1"
               project_id: 1
               updated_on: 2006-07-19 21:00:07 +02:00
               id: 1
               description: Beta
               effective_date: 2006-07-01
             versions_002:
               created_on: 2006-07-19 21:00:33 +02:00
               name: "1.0"
               project_id: 1
               updated_on: 2006-07-19 21:00:33 +02:00
               id: 2
               description: Stable release
-              effective_date: 2006-07-19
+              effective_date: <%= 20.day.from_now.to_date.to_s(:db) %>
             versions_003:
               created_on: 2006-07-19 21:00:33 +02:00
               name: "2.0"
               project_id: 1
               updated_on: 2006-07-19 21:00:33 +02:00
               id: 3
               description: Future version
               effective_date:
   No newline at end of file

test/functional/projects_controller_test.rb +10 -1

             # 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, :boards, :messages
               def setup
                 @controller = ProjectsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 @request.session[:user_id] = nil
               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_private_subprojects_hidden
                 get :show, :id => 'ecookbook'
                 assert_response :success
                 assert_template 'show'
                 assert_no_tag :tag => 'a', :content => /Private child/
               end
               def test_private_subprojects_visible
                 @request.session[:user_id] = 2 # manager who is a member of the private subproject
                 get :show, :id => 'ecookbook'
                 assert_response :success
                 assert_template 'show'
                 assert_tag :tag => 'a', :content => /Private child/
               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',
                                                    :custom_field_ids => ['']}
                 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_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_project_activity
                 get :activity, :id => 1, :with_subprojects => 0
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events_by_day)
                 assert_not_nil assigns(:events)
                 # subproject issue not included by default
                 assert !assigns(:events).include?(Issue.find(5))
                 assert_tag :tag => "h3",
                            :content => /#{2.days.ago.to_date.day}/,
                            :sibling => { :tag => "dl",
                              :child => { :tag => "dt",
                                :attributes => { :class => 'issue-edit' },
                                :child => { :tag => "a",
                                  :content => /(#{IssueStatus.find(2).name})/,
                                }
                              }
                            }
                 get :activity, :id => 1, :from => 3.days.ago.to_date
                 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 => "dl",
                              :child => { :tag => "dt",
                                :attributes => { :class => 'issue' },
                                :child => { :tag => "a",
                                  :content => /#{Issue.find(1).subject}/,
                                }
                              }
                            }
               end
               def test_activity_with_subprojects
                 get :activity, :id => 1, :with_subprojects => 1
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events)
                 assert assigns(:events).include?(Issue.find(1))
                 assert !assigns(:events).include?(Issue.find(4))
                 # subproject issue
                 assert assigns(:events).include?(Issue.find(5))
               end
               def test_global_activity_anonymous
                 get :activity
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events)
                 assert assigns(:events).include?(Issue.find(1))
                 # Issue of a private project
                 assert !assigns(:events).include?(Issue.find(4))
               end
               def test_global_activity_logged_user
                 @request.session[:user_id] = 2 # manager
                 get :activity
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events)
                 assert assigns(:events).include?(Issue.find(1))
                 # Issue of a private project the user belongs to
                 assert assigns(:events).include?(Issue.find(4))
               end
               def test_global_activity_with_all_types
                 get :activity, :show_issues => 1, :show_news => 1, :show_files => 1, :show_documents => 1, :show_changesets => 1, :show_wiki_pages => 1, :show_messages => 1
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events)
                 assert assigns(:events).include?(Issue.find(1))
                 assert !assigns(:events).include?(Issue.find(4))
                 assert assigns(:events).include?(Message.find(5))
               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_should_not_show_private_subprojects
                 get :calendar, :id => 1, :with_subprojects => 1, :tracker_ids => [1, 2]
                 assert_response :success
                 assert_template 'calendar'
                 assert_not_nil assigns(:calendar)
                 assert_no_tag :tag => 'a', :content => /#6/
               end
               def test_calendar_with_subprojects_should_show_private_subprojects
                 @request.session[:user_id] = 2
                 get :calendar, :id => 1, :with_subprojects => 1, :tracker_ids => [1, 2]
                 assert_response :success
                 assert_template 'calendar'
                 assert_not_nil assigns(:calendar)
                 assert_tag :tag => 'a', :content => /#6/
               end
               def test_gantt
                 get :gantt, :id => 1
                 assert_response :success
                 assert_template 'gantt.rhtml'
-                assert_not_nil assigns(:events)
+                events = assigns(:events)
+                assert_not_nil events
+                # Issue with start and due dates
+                i = Issue.find(1)
+                assert_not_nil i.due_date
+                assert events.include?(Issue.find(1))
+                # Issue with without due date but targeted to a version with date
+                i = Issue.find(2)
+                assert_nil i.due_date
+                assert events.include?(i)
               end
               def test_gantt_with_subprojects_should_not_show_private_subprojects
                 get :gantt, :id => 1, :with_subprojects => 1, :tracker_ids => [1, 2]
                 assert_response :success
                 assert_template 'gantt.rhtml'
                 assert_not_nil assigns(:events)
                 assert_no_tag :tag => 'a', :content => /#6/
               end
               def test_gantt_with_subprojects_should_show_private_subprojects
                 @request.session[:user_id] = 2
                 get :gantt, :id => 1, :with_subprojects => 1, :tracker_ids => [1, 2]
                 assert_response :success
                 assert_template 'gantt.rhtml'
                 assert_not_nil assigns(:events)
                 assert_tag :tag => 'a', :content => /#6/
               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
             end

test/functional/versions_controller_test.rb +3 -3

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
             require 'versions_controller'
             # Re-raise errors caught by the controller.
             class VersionsController; def rescue_action(e) raise e end; end
             class VersionsControllerTest < Test::Unit::TestCase
-              fixtures :projects, :versions, :users, :roles, :members, :enabled_modules
+              fixtures :projects, :versions, :issues, :users, :roles, :members, :enabled_modules
               def setup
                 @controller = VersionsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
               def test_show
                 get :show, :id => 2
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:version)
                 assert_tag :tag => 'h2', :content => /1.0/
               end
               def test_get_edit
                 @request.session[:user_id] = 2
                 get :edit, :id => 2
                 assert_response :success
                 assert_template 'edit'
               end
               def test_post_edit
                 @request.session[:user_id] = 2
                 post :edit, :id => 2,
                             :version => { :name => 'New version name',
                                           :effective_date => Date.today.strftime("%Y-%m-%d")}
                 assert_redirected_to 'projects/settings/ecookbook'
                 version = Version.find(2)
                 assert_equal 'New version name', version.name
                 assert_equal Date.today, version.effective_date
               end
               def test_destroy
                 @request.session[:user_id] = 2
-                post :destroy, :id => 2
+                post :destroy, :id => 3
                 assert_redirected_to 'projects/settings/ecookbook'
-                assert_nil Version.find_by_id(2)
+                assert_nil Version.find_by_id(3)
               end
               def test_issue_status_by
                 xhr :get, :status_by, :id => 2
                 assert_response :success
                 assert_template '_issue_counts'
               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