jro_apps/redmine Commit - r15540:eb023bdcce2b

Add option to set a new version as default directly from New Version page (#24011)....

Jean-Philippe Lang -

r15540:eb023bdcce2b

parent child

Context file:

r15540:eb023bdcce2b

Collapse all files

app/models/version.rb +26 0

               include Redmine::SafeAttributes
               after_update :update_issues_from_sharing_change
+              after_save :update_default_project_version
               before_destroy :nullify_projects_default_version
               belongs_to :project
                 'wiki_page_title',
                 'status',
                 'sharing',
+                'default_project_version',
                 'custom_field_values',
                 'custom_fields'
                 project.present? && project.attachments_deletable?(usr)
               end
+              alias :base_reload :reload
+              def reload(*args)
+                @default_project_version = nil
+                base_reload(*args)
+              end
               def start_date
                 @start_date ||= fixed_issues.minimum('start_date')
               end
                 fixed_issues.empty? && !referenced_by_a_custom_field?
               end
+              def default_project_version
+                if @default_project_version.nil?
+                  project.present? && project.default_version == self
+                else
+                  @default_project_version
+                end
+              end
+              def default_project_version=(arg)
+                @default_project_version = (arg == '1' || arg == true)
+              end
               private
               def load_issue_counts
                 end
               end
+              def update_default_project_version
+                if @default_project_version && project.present?
+                  project.update_columns :default_version_id => id
+                end
+              end
               # Returns the average estimated time of assigned issues
               # or 1 if no issue has an estimated time
               # Used to weight unestimated issues in progress calculation

app/views/versions/_form.html.erb +3 0

             <p><%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %></p>
             <p><%= f.date_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %></p>
             <p><%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %></p>
+            <% if @version.new_record? %>
+            <p><%= f.check_box :default_project_version, :label => :field_default_version %></p>
+            <% end %>
             <% @version.custom_field_values.each do |value| %>
               <p><%= custom_field_tag_with_label :version, value %></p>

test/unit/version_test.rb +16 0

@@ -29,6 +29,22 class VersionTest < ActiveSupport::TestCase
29	assert_equal 'none', v.sharing	29	assert_equal 'none', v.sharing
30	end	30	end
31		31
		32	def test_create_as_default_project_version
		33	project = Project.find(1)
		34	v = Version.new(:project => project, :name => '1.1',
		35	:default_project_version => '1')
		36	assert v.save
		37	assert_equal v, project.reload.default_version
		38	end
		39
		40	def test_create_not_as_default_project_version
		41	project = Project.find(1)
		42	v = Version.new(:project => project, :name => '1.1',
		43	:default_project_version => '0')
		44	assert v.save
		45	assert_nil project.reload.default_version
		46	end
		47
32	def test_invalid_effective_date_validation	48	def test_invalid_effective_date_validation
33	v = Version.new(:project => Project.find(1), :name => '1.1',	49	v = Version.new(:project => Project.find(1), :name => '1.1',
34	:effective_date => '99999-01-01')	50	:effective_date => '99999-01-01')

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