jro_apps/redmine Commit - r4346:9284a32c9ac7

Moves project attributes default assignments from ProjectsController#new to the model (#6064)....

Jean-Philippe Lang -

r4346:9284a32c9ac7

parent child

Context file:

r4346:9284a32c9ac7

Collapse all files

app/controllers/projects_controller.rb +1 -6

                 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                 @trackers = Tracker.all
                 @project = Project.new(params[:project])
-                @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
-                @project.trackers = Tracker.all
-                @project.is_public = Setting.default_projects_public?
-                @project.enabled_module_names = Setting.default_projects_modules
               end
               def create
                 @trackers = Tracker.all
                 @project = Project.new(params[:project])
-                @project.enabled_module_names = params[:enabled_modules]
+                @project.enabled_module_names = params[:enabled_modules] if params[:enabled_modules]
                 if validate_parent_id && @project.save
                   @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
                   # Add current user as a project member if he is not admin

app/models/project.rb +24 -1

               named_scope :all_public, { :conditions => { :is_public => true } }
               named_scope :visible, lambda { { :conditions => Project.visible_by(User.current) } }
+              def initialize(attributes = nil)
+                super
+                initialized = (attributes || {}).stringify_keys
+                if !initialized.key?('identifier') && Setting.sequential_project_identifiers?
+                  self.identifier = Project.next_identifier
+                end
+                if !initialized.key?('is_public')
+                  self.is_public = Setting.default_projects_public?
+                end
+                if !initialized.key?('enabled_module_names')
+                  self.enabled_module_names = Setting.default_projects_modules
+                end
+                if !initialized.key?('trackers') && !initialized.key?('tracker_ids')
+                  self.trackers = Tracker.all
+                end
+              end
               def identifier=(identifier)
                 super unless identifier_frozen?
               end
               def enabled_module_names=(module_names)
                 if module_names && module_names.is_a?(Array)
-                  module_names = module_names.collect(&:to_s)
+                  module_names = module_names.collect(&:to_s).reject(&:blank?)
                   # remove disabled modules
                   enabled_modules.each {|mod| mod.destroy unless module_names.include?(mod.name)}
                   # add new modules
                   enabled_modules.clear
                 end
               end
+              # Returns an array of the enabled modules names
+              def enabled_module_names
+                enabled_modules.collect(&:name)
+              end
               # Returns an array of projects that are in this project's hierarchy
               #

app/views/projects/new.html.erb +2 0

                 <%= l_or_humanize(m, :prefix => "project_module_") %>
                 </label>
             <% end %>
+            <%= hidden_field_tag 'enabled_modules[]', '' %>
             </fieldset>
             <%= submit_tag l(:button_save) %>

test/integration/api_test/projects_test.rb +2 0

               context "POST /projects" do
                 context "with valid parameters" do
                   setup do
+                    Setting.default_projects_modules = ['issue_tracking', 'repository']
                     @parameters = {:project => {:name => 'API test', :identifier => 'api-test'}}
                   end
                       project = Project.first(:order => 'id DESC')
                       assert_equal 'API test', project.name
                       assert_equal 'api-test', project.identifier
+                      assert_equal ['issue_tracking', 'repository'], project.enabled_module_names
                       assert_response :created
                       assert_equal 'application/xml', @response.content_type

test/unit/project_test.rb +29 0

@@ -60,6 +60,35 class ProjectTest < ActiveSupport::TestCase
60	assert_equal "eCookbook", @ecookbook.name	60	assert_equal "eCookbook", @ecookbook.name
61	end	61	end
62		62
		63	def test_default_attributes
		64	with_settings :default_projects_public => '1' do
		65	assert_equal true, Project.new.is_public
		66	assert_equal false, Project.new(:is_public => false).is_public
		67	end
		68
		69	with_settings :default_projects_public => '0' do
		70	assert_equal false, Project.new.is_public
		71	assert_equal true, Project.new(:is_public => true).is_public
		72	end
		73
		74	with_settings :sequential_project_identifiers => '1' do
		75	assert !Project.new.identifier.blank?
		76	assert Project.new(:identifier => '').identifier.blank?
		77	end
		78
		79	with_settings :sequential_project_identifiers => '0' do
		80	assert Project.new.identifier.blank?
		81	assert !Project.new(:identifier => 'test').blank?
		82	end
		83
		84	with_settings :default_projects_modules => ['issue_tracking', 'repository'] do
		85	assert_equal ['issue_tracking', 'repository'], Project.new.enabled_module_names
		86	end
		87
		88	assert_equal Tracker.all, Project.new.trackers
		89	assert_equal Tracker.find(1, 3), Project.new(:tracker_ids => [1, 3]).trackers
		90	end
		91
63	def test_update	92	def test_update
64	assert_equal "eCookbook", @ecookbook.name	93	assert_equal "eCookbook", @ecookbook.name
65	@ecookbook.name = "eCook"	94	@ecookbook.name = "eCook"

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