From d34ea9a56986a524382641de987f818bbd0131e4 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 20 May 2007 17:46:02 +0000 Subject: Versions can now be created with no date. Versions with no date appear at the end of the roadmap, sorted by name. git-svn-id: http://redmine.rubyforge.org/svn/trunk@536 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/projects_controller.rb | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index e90196495..debb0a00a 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -426,35 +426,25 @@ class ProjectsController < ApplicationController Mailer.deliver_attachments_add(@attachments) if !@attachments.empty? and Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled? redirect_to :controller => 'projects', :action => 'list_files', :id => @project end - @versions = @project.versions + @versions = @project.versions.sort end def list_files - @versions = @project.versions + @versions = @project.versions.sort end # Show changelog for @project def changelog @trackers = Tracker.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position') - retrieve_selected_tracker_ids(@trackers) - - @fixed_issues = @project.issues.find(:all, - :include => [ :fixed_version, :status, :tracker ], - :conditions => [ "#{IssueStatus.table_name}.is_closed=? and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}) and #{Issue.table_name}.fixed_version_id is not null", true], - :order => "#{Version.table_name}.effective_date DESC, #{Issue.table_name}.id DESC" - ) unless @selected_tracker_ids.empty? - @fixed_issues ||= [] + retrieve_selected_tracker_ids(@trackers) + @versions = @project.versions.sort end def roadmap @trackers = Tracker.find(:all, :conditions => ["is_in_roadmap=?", true], :order => 'position') - retrieve_selected_tracker_ids(@trackers) - conditions = ("1" == params[:completed] ? nil : [ "#{Version.table_name}.effective_date > ?", Date.today]) - - @versions = @project.versions.find(:all, - :conditions => conditions, - :order => "#{Version.table_name}.effective_date ASC" - ) + retrieve_selected_tracker_ids(@trackers) + conditions = ("1" == params[:completed] ? nil : [ "#{Version.table_name}.effective_date > ? OR #{Version.table_name}.effective_date IS NULL", Date.today]) + @versions = @project.versions.find(:all, :conditions => conditions).sort end def activity -- cgit v1.2.3