jro_apps/redmine Commit - r14404:9178d4748f19

db/migrate/20151031095005_add_projects_default_version_id.rb created 644 +12 0

@@ -0,0 +1,12
	1	class AddProjectsDefaultVersionId < ActiveRecord::Migration
	2	def self.up
	3	# Don't try to add the column if redmine_default_version plugin was used
	4	unless column_exists?(:projects, :default_version_id, :integer)
	5	add_column :projects, :default_version_id, :integer, :default => nil
	6	end
	7	end
	8
	9	def self.down
	10	remove_column :projects, :default_version_id
	11	end
	12	end

app/helpers/projects_helper.rb +8 0

                 end
               end
+              def project_default_version_options(project)
+                versions = project.shared_versions.open.to_a
+                if project.default_version && !versions.include?(project.default_version)
+                  versions << project.default_version
+                end
+                version_options_for_select(versions, project.default_version)
+              end
               def format_version_sharing(sharing)
                 sharing = 'none' unless Version::VERSION_SHARINGS.include?(sharing)
                 l("label_version_sharing_#{sharing}")

app/models/issue.rb +13 -4

               # Unless keep_tracker argument is set to true, this will change the tracker
               # to the first tracker of the new project if the previous tracker is not part
               # of the new project trackers.
-              # This will clear the fixed_version is it's no longer valid for the new project.
+              # This will:
-              # This will clear the parent issue if it's no longer valid for the new project.
+              # * clear the fixed_version is it's no longer valid for the new project.
-              # This will set the category to the category with the same name in the new
+              # * clear the parent issue if it's no longer valid for the new project.
-              # project if it exists, or clear it if it doesn't.
+              # * set the category to the category with the same name in the new
+              #   project if it exists, or clear it if it doesn't.
+              # * for new issue, set the fixed_version to the project default version
+              #   if it's a valid fixed_version.
               def project=(project, keep_tracker=false)
                 project_was = self.project
                 association(:project).writer(project)
                   @custom_field_values = nil
                   @workflow_rule_by_attribute = nil
                 end
+                # Set fixed_version to the project default version if it's valid
+                if new_record? && fixed_version.nil? && project && project.default_version_id?
+                  if project.shared_versions.open.exists?(project.default_version_id)
+                    self.fixed_version_id = project.default_version_id
+                  end
+                end
                 self.project
               end

app/models/project.rb +3 -1

               has_many :issues, :dependent => :destroy
               has_many :issue_changes, :through => :issues, :source => :journals
               has_many :versions, lambda {order("#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC")}, :dependent => :destroy
+              belongs_to :default_version, :class_name => 'Version'
               has_many :time_entries, :dependent => :destroy
               has_many :queries, :class_name => 'IssueQuery', :dependent => :delete_all
               has_many :documents, :dependent => :destroy
                 'custom_fields',
                 'tracker_ids',
                 'issue_custom_field_ids',
-                'parent_id'
+                'parent_id',
+                'default_version_id'
               safe_attributes 'enabled_module_names',
                 :if => lambda {|project, user| project.new_record? || user.allowed_to?(:select_project_modules, project) }

app/models/version.rb +7 0

             class Version < ActiveRecord::Base
               include Redmine::SafeAttributes
               after_update :update_issues_from_sharing_change
+              before_destroy :nullify_projects_default_version
               belongs_to :project
               has_many :fixed_issues, :class_name => 'Issue', :foreign_key => 'fixed_version_id', :dependent => :nullify
               acts_as_customizable
                 CustomValue.joins(:custom_field).
                   where(:value => id.to_s, :custom_fields => {:field_format => 'version'}).any?
               end
+              def nullify_projects_default_version
+                Project.where(:default_version_id => id).update_all(:default_version_id => nil)
+              end
             end

app/views/projects/_form.html.erb +4 0

             <p><%= f.check_box :inherit_members %></p>
             <% end %>
+            <% if @project.safe_attribute?('default_version_id') && (default_version_options = project_default_version_options(@project)).present? %>
+              <p><%= f.select :default_version_id, project_default_version_options(@project), :include_blank => true %></p>
+            <% end %>
             <%= wikitoolbar_for 'project_description' %>
             <% @project.custom_field_values.each do |value| %>

config/locales/en.yml +1 0

               field_users_visibility: Users visibility
               field_time_entries_visibility: Time logs visibility
               field_total_estimated_hours: Total estimated time
+              field_default_version: Default version
               setting_app_title: Application title
               setting_app_subtitle: Application subtitle

config/locales/fr.yml +1 0

               field_users_visibility: Visibilité des utilisateurs
               field_time_entries_visibility: Visibilité du temps passé
               field_total_estimated_hours: Temps estimé total
+              field_default_version: Version par défaut
               setting_app_title: Titre de l'application
               setting_app_subtitle: Sous-titre de l'application

test/functional/issues_controller_test.rb +13 0

@@ -1715,6 +1715,19 class IssuesControllerTest < ActionController::TestCase
1715	end	1715	end
1716	end	1716	end
1717		1717
		1718	def test_new_should_preselect_default_version
		1719	version = Version.generate!(:project_id => 1)
		1720	Project.find(1).update_attribute :default_version_id, version.id
		1721	@request.session[:user_id] = 2
		1722
		1723	get :new, :project_id => 1
		1724	assert_response :success
		1725	assert_equal version, assigns(:issue).fixed_version
		1726	assert_select 'select[name=?]', 'issue[fixed_version_id]' do
		1727	assert_select 'option[value=?][selected=selected]', version.id.to_s
		1728	end
		1729	end
		1730
1718	def test_get_new_with_list_custom_field	1731	def test_get_new_with_list_custom_field
1719	@request.session[:user_id] = 2	1732	@request.session[:user_id] = 2
1720	get :new, :project_id => 1, :tracker_id => 1	1733	get :new, :project_id => 1, :tracker_id => 1

test/unit/issue_test.rb +8 0

                 assert_equal custom_value.id, issue.custom_value_for(field).id
               end
+              def test_setting_project_should_set_version_to_default_version
+                version = Version.generate!(:project_id => 1)
+                Project.find(1).update_attribute(:default_version_id, version.id)
+                issue = Issue.new(:project_id => 1)
+                assert_equal version, issue.fixed_version
+              end
               def test_should_not_update_custom_fields_on_changing_tracker_with_different_custom_fields
                 issue = Issue.create!(:project_id => 1, :tracker_id => 1, :author_id => 1,
                                       :status_id => 1, :subject => 'Test',

	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