jro_apps/redmine Commit - r533:d34ea9a56986

db/migrate/048_allow_null_version_effective_date.rb created 644 +9 0

@@ -0,0 +1,9
	1	class AllowNullVersionEffectiveDate < ActiveRecord::Migration
	2	def self.up
	3	change_column :versions, :effective_date, :date, :default => nil
	4	end
	5
	6	def self.down
	7	raise IrreversibleMigration
	8	end
	9	end

app/controllers/projects_controller.rb +7 -17

                   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)
+                @versions = @project.versions.sort
-                @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 ||= []
               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])
+                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
-                @versions = @project.versions.find(:all,
-                  :conditions => conditions,
-                  :order => "#{Version.table_name}.effective_date ASC"
               end
               def activity

app/models/query.rb +1 -1

                   @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => user_values }
                   @available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values }
                   @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } }
-                  @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.collect{|s| [s.name, s.id.to_s] } }
+                  @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.sort.collect{|s| [s.name, s.id.to_s] } }
                   unless @project.children.empty?
                     @available_filters["subproject_id"] = { :type => :list_one_or_more, :order => 13, :values => @project.children.collect{|s| [s.name, s.id.to_s] } }
                   end

app/models/version.rb +11 -1

               validates_presence_of :name
               validates_uniqueness_of :name, :scope => [:project_id]
-              validates_format_of :effective_date, :with => /^\d{4}-\d{2}-\d{2}$/, :message => :activerecord_error_not_a_date
+              validates_format_of :effective_date, :with => /^\d{4}-\d{2}-\d{2}$/, :message => :activerecord_error_not_a_date, :allow_nil => true
               def start_date
                 effective_date
                 effective_date && effective_date <= Date.today
               end
+              # Versions are sorted by effective_date
+              # Those with no effective_date are at the end, sorted by name
+              def <=>(version)
+                if self.effective_date
+                  version.effective_date ? (self.effective_date <=> version.effective_date) : -1
+                else
+                  version.effective_date ? 1 : (self.name <=> version.name)
+                end
+              end
             private
               def check_integrity
                 raise "Can't delete version" if self.fixed_issues.find(:first)

app/views/projects/changelog.rhtml +20 -11

@@ -11,17 +11,26
11	<% end %>	11	<% end %>
12	</div>	12	</div>
13		13
14	<% if @~~fixed_issue~~s.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>	14	<% if @versions.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
15		15
16	<% ver_id = nil	16	<% @versions.each do \|version\| %>
17	@fixed_issues.each do \|issue\| %>	17	<a name="<%= version.name %>"><h3 class="icon22 icon22-package"><%= version.name %></h3></a>
18	<% unless ver_id == issue.fixed_version_id %>	18	<% if version.completed? %>
19	<% if ver_id %></ul><% end %>	19	<p><%= format_date(version.effective_date) %></p>
20	<h3 class="icon22 icon22-package"><%= issue.fixed_version.name %></h3>	20	<% elsif version.effective_date %>
21	<p><%= format_date(issue.fixed_version.effective_date) %><br />	21	<p><strong><%=l(:label_roadmap_due_in)%> <%= distance_of_time_in_words Time.now, version.effective_date %> (<%= format_date(version.effective_date) %>)</strong></p>
22	<%=h issue.fixed_version.description %></p>	22	<% end %>
		23	<p><%=h version.description %></p>
		24	<% issues = version.fixed_issues.find(:all,
		25	:include => [:status, :tracker],
		26	:conditions => ["#{IssueStatus.table_name}.is_closed=? AND #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')})", true],
		27	:order => "#{Tracker.table_name}.position")
		28	%>
		29	<% if !issues.empty? %>
23	<ul>	30	<ul>
24	<% ver_id = issue.fixed_version_id	31	<% issues.each do \|issue\| %>
25	end %>	32	<li><%= link_to_issue(issue) %>: <%=h issue.subject %></li>
26	<li><%= link_to_issue issue %>: <%=h issue.subject %></li>	33	<% end %>
		34	</ul>
		35	<% end %>
27	<% end %>	36	<% end %>

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

                 <a name="<%= version.name %>"><h3 class="icon22 icon22-package"><%= version.name %></h3></a>
                 <% if version.completed? %>
                   <p><%= format_date(version.effective_date) %></p>
-                <% else %>
+                <% elsif version.effective_date %>
                   <p><strong><%=l(:label_roadmap_due_in)%> <%= distance_of_time_in_words Time.now, version.effective_date %> (<%= format_date(version.effective_date) %>)</strong></p>
                 <% end %>
                 <p><%=h version.description %></p>

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

             <table class="list">
             	<thead><th><%= l(:label_version) %></th><th><%= l(:field_effective_date) %></th><th><%= l(:field_description) %></th><th style="width:15%"></th><th style="width:15%"></th></thead>
             	<tbody>
-            <% for version in @project.versions %>
+            <% for version in @project.versions.sort %>
                 <tr class="<%= cycle 'odd', 'even' %>">
                 <td><%=h version.name %></td>
                 <td align="center"><%= format_date(version.effective_date) %></td>

app/views/versions/_form.rhtml +1 -1

             <!--[form:version]-->
             <p><%= f.text_field :name, :size => 20, :required => true %></p>
             <p><%= f.text_field :description, :size => 60 %></p>
-            <p><%= f.text_field :effective_date, :size => 10, :required => true %><%= calendar_for('version_effective_date') %></p>
+            <p><%= f.text_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %></p>
             <!--[eoform:version]-->
             </div>

test/fixtures/versions.yml +9 0

@@ -15,3 +15,12 versions_002:
15	id: 2	15	id: 2
16	description: Stable release	16	description: Stable release
17	effective_date: 2006-07-19	17	effective_date: 2006-07-19
		18	versions_003:
		19	created_on: 2006-07-19 21:00:33 +02:00
		20	name: "2.0"
		21	project_id: 1
		22	updated_on: 2006-07-19 21:00:33 +02:00
		23	id: 3
		24	description: Future version
		25	effective_date:
		26	No newline at end of file

test/functional/projects_controller_test.rb +1 -1

                 get :changelog, :id => 1
                 assert_response :success
                 assert_template 'changelog'
-                assert_not_nil assigns(:fixed_issues)
+                assert_not_nil assigns(:versions)
               end
               def test_roadmap

	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