jro_apps/redmine Commit - r4525:9fb770ba503b

Moves enabled_module_names param to project attribute so that it can be set through the Project API....

Jean-Philippe Lang -

r4525:9fb770ba503b

parent child

Context file:

r4525:9fb770ba503b

Collapse all files

app/controllers/projects_controller.rb 0 -1

                 @project = Project.new
                 @project.safe_attributes = params[:project]
-                @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 +4 -1

                             :url => Proc.new {|o| {:controller => 'projects', :action => 'show', :id => o}},
                             :author => nil
-              attr_protected :status, :enabled_module_names
+              attr_protected :status
               validates_presence_of :name, :identifier
               validates_uniqueness_of :identifier
                 'tracker_ids',
                 'issue_custom_field_ids'
+              safe_attributes 'enabled_module_names',
+                :if => lambda {|project, user| project.new_record? || user.allowed_to?(:select_project_modules, project) }
               # Returns an array of projects that are in this project's hierarchy
               #
               # Example: parents, children, siblings

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

             <fieldset class="box"><legend><%= l(:label_module_plural) %></legend>
             <% Redmine::AccessControl.available_project_modules.each do |m| %>
                 <label class="floating">
-                <%= check_box_tag 'enabled_modules[]', m, @project.module_enabled?(m) %>
+                <%= check_box_tag 'project[enabled_module_names][]', m, @project.module_enabled?(m) %>
                 <%= l_or_humanize(m, :prefix => "project_module_") %>
                 </label>
             <% end %>
-            <%= hidden_field_tag 'enabled_modules[]', '' %>
+            <%= hidden_field_tag 'project[enabled_module_names][]', '' %>
             </fieldset>

test/fixtures/roles.yml +1 0

                 ---
                 - :add_project
                 - :edit_project
+                - :select_project_modules
                 - :manage_members
                 - :manage_versions
                 - :manage_categories

test/functional/projects_controller_test.rb +8 -2

                         :custom_field_values => { '3' => 'Beta' },
                         :tracker_ids => ['1', '3'],
                         # an issue custom field that is not for all project
-                        :issue_custom_field_ids => ['9']
+                        :issue_custom_field_ids => ['9'],
+                        :enabled_module_names => ['issue_tracking', 'news', 'repository']
                       }
                     assert_redirected_to '/projects/blog/settings'
                     assert_nil project.parent
                     assert_equal 'Beta', project.custom_value_for(3).value
                     assert_equal [1, 3], project.trackers.map(&:id).sort
+                    assert_equal ['issue_tracking', 'news', 'repository'], project.enabled_module_names.sort
                     assert project.issue_custom_fields.include?(IssueCustomField.find(9))
                   end
                                              :description => "weblog",
                                              :identifier => "blog",
                                              :is_public => 1,
-                                             :custom_field_values => { '3' => 'Beta' }
+                                             :custom_field_values => { '3' => 'Beta' },
+                                             :tracker_ids => ['1', '3'],
+                                             :enabled_module_names => ['issue_tracking', 'news', 'repository']
                                             }
                     assert_redirected_to '/projects/blog/settings'
                     assert_kind_of Project, project
                     assert_equal 'weblog', project.description
                     assert_equal true, project.is_public?
+                    assert_equal [1, 3], project.trackers.map(&:id).sort
+                    assert_equal ['issue_tracking', 'news', 'repository'], project.enabled_module_names.sort
                     # User should be added as a project member
                     assert User.find(9).member_of?(project)

test/integration/api_test/projects_test.rb +46 -1

@@ -122,12 +122,35 class ApiTest::ProjectsTest < ActionController::IntegrationTest
122	project = Project.first(:order => 'id DESC')	122	project = Project.first(:order => 'id DESC')
123	assert_equal 'API test', project.name	123	assert_equal 'API test', project.name
124	assert_equal 'api-test', project.identifier	124	assert_equal 'api-test', project.identifier
125	assert_equal ['issue_tracking', 'repository'], project.enabled_module_names	125	assert_equal ['issue_tracking', 'repository'], project.enabled_module_names.sort
		126	assert_equal Tracker.all.size, project.trackers.size
126		127
127	assert_response :created	128	assert_response :created
128	assert_equal 'application/xml', @response.content_type	129	assert_equal 'application/xml', @response.content_type
129	assert_tag 'project', :child => {:tag => 'id', :content => project.id.to_s}	130	assert_tag 'project', :child => {:tag => 'id', :content => project.id.to_s}
130	end	131	end
		132
		133	should "accept enabled_module_names attribute" do
		134	@parameters[:project].merge!({:enabled_module_names => ['issue_tracking', 'news', 'time_tracking']})
		135
		136	assert_difference('Project.count') do
		137	post '/projects.xml', @parameters, :authorization => credentials('admin')
		138	end
		139
		140	project = Project.first(:order => 'id DESC')
		141	assert_equal ['issue_tracking', 'news', 'time_tracking'], project.enabled_module_names.sort
		142	end
		143
		144	should "accept tracker_ids attribute" do
		145	@parameters[:project].merge!({:tracker_ids => [1, 3]})
		146
		147	assert_difference('Project.count') do
		148	post '/projects.xml', @parameters, :authorization => credentials('admin')
		149	end
		150
		151	project = Project.first(:order => 'id DESC')
		152	assert_equal [1, 3], project.trackers.map(&:id).sort
		153	end
131	end	154	end
132	end	155	end
133		156
@@ -171,6 +194,28 class ApiTest::ProjectsTest < ActionController::IntegrationTest
171	project = Project.find(2)	194	project = Project.find(2)
172	assert_equal 'API update', project.name	195	assert_equal 'API update', project.name
173	end	196	end
		197
		198	should "accept enabled_module_names attribute" do
		199	@parameters[:project].merge!({:enabled_module_names => ['issue_tracking', 'news', 'time_tracking']})
		200
		201	assert_no_difference 'Project.count' do
		202	put '/projects/2.xml', @parameters, :authorization => credentials('admin')
		203	end
		204	assert_response :ok
		205	project = Project.find(2)
		206	assert_equal ['issue_tracking', 'news', 'time_tracking'], project.enabled_module_names.sort
		207	end
		208
		209	should "accept tracker_ids attribute" do
		210	@parameters[:project].merge!({:tracker_ids => [1, 3]})
		211
		212	assert_no_difference 'Project.count' do
		213	put '/projects/2.xml', @parameters, :authorization => credentials('admin')
		214	end
		215	assert_response :ok
		216	project = Project.find(2)
		217	assert_equal [1, 3], project.trackers.map(&:id).sort
		218	end
174	end	219	end
175	end	220	end
176		221

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