jro_apps/redmine Commit - r4540:6e695a4d1a37

Merged r4645 to r4651 from trunk....

Jean-Philippe Lang -

r4540:6e695a4d1a37

parent child

Context file:

r4540:6e695a4d1a37

Collapse all files

app/controllers/projects_controller.rb +6 -6

                 end
               end
-              # TODO: convert to PUT only
-              verify :method => [:post, :put], :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
               helper :sort
               include SortHelper
               helper :custom_fields
                 @project = Project.new(params[:project])
               end
+              verify :method => :post, :only => :create, :render => {:nothing => true, :status => :method_not_allowed }
               def create
                 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                 @trackers = Tracker.all
                 @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
               def edit
               end
+              # TODO: convert to PUT only
+              verify :method => [:post, :put], :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
               def update
                 @project.safe_attributes = params[:project]
                 if validate_parent_id && @project.save
                   end
                 end
               end
+              verify :method => :post, :only => :modules, :render => {:nothing => true, :status => :method_not_allowed }
               def modules
-                @project.enabled_module_names = params[:enabled_modules]
+                @project.enabled_module_names = params[:enabled_module_names]
                 flash[:notice] = l(:notice_successful_update)
                 redirect_to :action => 'settings', :id => @project, :tab => 'modules'
               end

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/_form.rhtml +17 -2

             <%= call_hook(:view_projects_form, :project => @project, :form => f) %>
             </div>
+            <% if @project.new_record? %>
+            <fieldset class="box"><legend><%= l(:label_module_plural) %></legend>
+            <% Redmine::AccessControl.available_project_modules.each do |m| %>
+                <label class="floating">
+                <%= check_box_tag 'project[enabled_module_names][]', m, @project.module_enabled?(m), :id => "project_enabled_module_names_#{m}" %>
+                <%= l_or_humanize(m, :prefix => "project_module_") %>
+                </label>
+            <% end %>
+            <%= hidden_field_tag 'project[enabled_module_names][]', '' %>
+            <%= javascript_tag 'observeProjectModules()' %>
+            </fieldset>
+            <% end %>
+            <% if @project.new_record? || @project.module_enabled?('issue_tracking') %>
             <% unless @trackers.empty? %>
-            <fieldset class="box"><legend><%=l(:label_tracker_plural)%></legend>
+            <fieldset class="box" id="project_trackers"><legend><%=l(:label_tracker_plural)%></legend>
             <% @trackers.each do |tracker| %>
                 <label class="floating">
                 <%= check_box_tag 'project[tracker_ids][]', tracker.id, @project.trackers.include?(tracker) %>
             <% end %>
             <% unless @issue_custom_fields.empty? %>
-            <fieldset class="box"><legend><%=l(:label_custom_field_plural)%></legend>
+            <fieldset class="box" id="project_issue_custom_fields"><legend><%=l(:label_custom_field_plural)%></legend>
             <% @issue_custom_fields.each do |custom_field| %>
                 <label class="floating">
             	<%= check_box_tag 'project[issue_custom_field_ids][]', custom_field.id, (@project.all_issue_custom_fields.include? custom_field), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
             <%= hidden_field_tag 'project[issue_custom_field_ids][]', '' %>
             </fieldset>
             <% end %>
+            <% end %>
             <!--[eoform:project]-->

app/views/projects/new.html.erb 0 -12

@@ -2,18 +2,6
2		2
3	<% labelled_tabular_form_for :project, @project, :url => { :action => "create" } do \|f\| %>	3	<% labelled_tabular_form_for :project, @project, :url => { :action => "create" } do \|f\| %>
4	<%= render :partial => 'form', :locals => { :f => f } %>	4	<%= render :partial => 'form', :locals => { :f => f } %>
5
6	<fieldset class="box"><legend><%= l(:label_module_plural) %></legend>
7	<% Redmine::AccessControl.available_project_modules.each do \|m\| %>
8	<label class="floating">
9	<%= check_box_tag 'enabled_modules[]', m, @project.module_enabled?(m) %>
10	<%= l_or_humanize(m, :prefix => "project_module_") %>
11	</label>
12	<% end %>
13	<%= hidden_field_tag 'enabled_modules[]', '' %>
14
15	</fieldset>
16
17	<%= submit_tag l(:button_save) %>	5	<%= submit_tag l(:button_save) %>
18	<%= javascript_tag "Form.Element.focus('project_name');" %>	6	<%= javascript_tag "Form.Element.focus('project_name');" %>
19	<% end %>	7	<% end %>

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

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

app/views/wiki/history.rhtml +6 -6

             <% form_tag({:action => "diff"}, :method => :get) do %>
               <%= hidden_field_tag('project_id', h(@project.to_param)) %>
-            <table class="list">
+            <table class="list wiki-page-versions">
             <thead><tr>
                 <th>#</th>
                 <th></th>
             <% show_diff = @versions.size > 1 %>
             <% line_num = 1 %>
             <% @versions.each do |ver| %>
-            <tr class="<%= cycle("odd", "even") %>">
+            <tr class="wiki-page-version <%= cycle("odd", "even") %>">
                 <td class="id"><%= link_to ver.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => ver.version %></td>
                 <td class="checkbox"><%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < @versions.size) %></td>
                 <td class="checkbox"><%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") if show_diff && (line_num > 1) %></td>
-                <td align="center"><%= format_time(ver.updated_on) %></td>
+                <td class="updated_on"><%= format_time(ver.updated_on) %></td>
-                <td><%= link_to_user ver.author %></td>
+                <td class="author"><%= link_to_user ver.author %></td>
-                <td><%=h ver.comments %></td>
+                <td class="comments"><%=h ver.comments %></td>
-                <td align="center"><%= link_to l(:button_annotate), :action => 'annotate', :id => @page.title, :version => ver.version %></td>
+                <td class="buttons"><%= link_to l(:button_annotate), :action => 'annotate', :id => @page.title, :version => ver.version %></td>
             </tr>
             <% line_num += 1 %>
             <% end %>

public/javascripts/application.js +18 0

@@ -232,6 +232,24 function observeRelatedIssueField(url) {
232	});	232	});
233	}	233	}
234		234
		235	function setVisible(id, visible) {
		236	var el = $(id);
		237	if (el) {if (visible) {el.show();} else {el.hide();}}
		238	}
		239
		240	function observeProjectModules() {
		241	var f = function() {
		242	/* Hides trackers and issues custom fields on the new project form when issue_tracking module is disabled */
		243	var c = ($('project_enabled_module_names_issue_tracking').checked == true);
		244	setVisible('project_trackers', c);
		245	setVisible('project_issue_custom_fields', c);
		246	};
		247
		248	Event.observe(window, 'load', f);
		249	Event.observe('project_enabled_module_names_issue_tracking', 'change', f);
		250	}
		251
		252
235	/* shows and hides ajax indicator */	253	/* shows and hides ajax indicator */
236	Ajax.Responders.register({	254	Ajax.Responders.register({
237	onCreate: function(){	255	onCreate: function(){

public/stylesheets/application.css +2 0

             tr.user.locked, tr.user.registered { color: #aaa; }
             tr.user.locked a, tr.user.registered a { color: #aaa; }
+            tr.wiki-page-version td.updated_on, tr.wiki-page-version td.author {text-align:center;}
             tr.time-entry { text-align: center; white-space: nowrap; }
             tr.time-entry td.subject, tr.time-entry td.comments { text-align: left; white-space: normal; }
             td.hours { text-align: right; font-weight: bold; padding-right: 0.5em; }

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 +29 -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)
                 end
               end
+              def test_create_should_not_accept_get
+                @request.session[:user_id] = 1
+                get :create
+                assert_response :method_not_allowed
+              end
               def test_show_by_id
                 get :show, :id => 1
                 assert_response :success
                 project = Project.find(1)
                 assert_equal 'Test changed name', project.name
               end
+              def test_modules
+                @request.session[:user_id] = 2
+                Project.find(1).enabled_module_names = ['issue_tracking', 'news']
+                post :modules, :id => 1, :enabled_module_names => ['issue_tracking', 'repository', 'documents']
+                assert_redirected_to '/projects/ecookbook/settings/modules'
+                assert_equal ['documents', 'issue_tracking', 'repository'], Project.find(1).enabled_module_names.sort
+              end
+              def test_modules_should_not_allow_get
+                @request.session[:user_id] = 1
+                get :modules, :id => 1
+                assert_response :method_not_allowed
+              end
               def test_get_destroy
                 @request.session[:user_id] = 1 # admin

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

test/unit/project_nested_set_test.rb +93 -33

@@ -19,40 +19,100 require File.expand_path('../../test_helper', __FILE__)
19		19
20	class ProjectNestedSetTest < ActiveSupport::TestCase	20	class ProjectNestedSetTest < ActiveSupport::TestCase
21		21
22	def setup	22	context "nested set" do
23	Project.delete_all	23	setup do
24	end	24	Project.delete_all
25		25
26	def test_destroy_root_and_chldren_should_not_mess_up_the_tree	26	@a = Project.create!(:name => 'Project A', :identifier => 'projecta')
27	a = Project.create!(:name => 'Project A', :identifier => 'projecta')	27	@a1 = Project.create!(:name => 'Project A1', :identifier => 'projecta1')
28	a1 = Project.create!(:name => 'Project A1', :identifier => 'projecta1')	28	@a1.set_parent!(@a)
29	a2 = Project.create!(:name => 'Project A2', :identifier => 'projecta2')	29	@a2 = Project.create!(:name => 'Project A2', :identifier => 'projecta2')
30	a1.set_parent!(a)	30	@a2.set_parent!(@a)
31	a2.set_parent!(a)	31
32	b = Project.create!(:name => 'Project B', :identifier => 'projectb')	32	@b = Project.create!(:name => 'Project B', :identifier => 'projectb')
33	b1 = Project.create!(:name => 'Project B1', :identifier => 'projectb1')	33	@b1 = Project.create!(:name => 'Project B1', :identifier => 'projectb1')
34	b1.set_parent!(b)	34	@b1.set_parent!(@b)
35		35	@b11 = Project.create!(:name => 'Project B11', :identifier => 'projectb11')
36	a.reload	36	@b11.set_parent!(@b1)
37	a1.reload	37	@b2 = Project.create!(:name => 'Project B2', :identifier => 'projectb2')
38	a2.reload	38	@b2.set_parent!(@b)
39	b.reload	39
40	b1.reload	40	@c = Project.create!(:name => 'Project C', :identifier => 'projectc')
41		41	@c1 = Project.create!(:name => 'Project C1', :identifier => 'projectc1')
42	assert_equal [nil, 1, 6], [a.parent_id, a.lft, a.rgt]	42	@c1.set_parent!(@c)
43	assert_equal [a.id, 2, 3], [a1.parent_id, a1.lft, a1.rgt]	43
44	assert_equal [a.id, 4, 5], [a2.parent_id, a2.lft, a2.rgt]	44	[@a, @a1, @a2, @b, @b1, @b11, @b2, @c, @c1].each(&:reload)
45	assert_equal [nil, 7, 10], [b.parent_id, b.lft, b.rgt]	45	end
46	assert_equal [b.id, 8, 9], [b1.parent_id, b1.lft, b1.rgt]
47		46
48	assert_difference 'Project.count', -3 do	47	context "#create" do
49	a.destroy	48	should "build valid tree" do
		49	assert_nested_set_values({
		50	@a => [nil, 1, 6],
		51	@a1 => [@a.id, 2, 3],
		52	@a2 => [@a.id, 4, 5],
		53	@b => [nil, 7, 14],
		54	@b1 => [@b.id, 8, 11],
		55	@b11 => [@b1.id,9, 10],
		56	@b2 => [@b.id,12, 13],
		57	@c => [nil, 15, 18],
		58	@c1 => [@c.id,16, 17]
		59	})
		60	end
50	end	61	end
51		62
52	b.reload	63	context "#set_parent!" do
53	b1.reload	64	should "keep valid tree" do
54		65	assert_no_difference 'Project.count' do
55	assert_equal [nil, 1, 4], [b.parent_id, b.lft, b.rgt]	66	Project.find_by_name('Project B1').set_parent!(Project.find_by_name('Project A2'))
56	assert_equal [b.id, 2, 3], [b1.parent_id, b1.lft, b1.rgt]	67	end
		68	assert_nested_set_values({
		69	@a => [nil, 1, 10],
		70	@a2 => [@a.id, 4, 9],
		71	@b1 => [@a2.id,5, 8],
		72	@b11 => [@b1.id,6, 7],
		73	@b => [nil, 11, 14],
		74	@c => [nil, 15, 18]
		75	})
		76	end
		77	end
		78
		79	context "#destroy" do
		80	context "a root with children" do
		81	should "not mess up the tree" do
		82	assert_difference 'Project.count', -4 do
		83	Project.find_by_name('Project B').destroy
		84	end
		85	assert_nested_set_values({
		86	@a => [nil, 1, 6],
		87	@a1 => [@a.id, 2, 3],
		88	@a2 => [@a.id, 4, 5],
		89	@c => [nil, 7, 10],
		90	@c1 => [@c.id, 8, 9]
		91	})
		92	end
		93	end
		94
		95	context "a child with children" do
		96	should "not mess up the tree" do
		97	assert_difference 'Project.count', -2 do
		98	Project.find_by_name('Project B1').destroy
		99	end
		100	assert_nested_set_values({
		101	@a => [nil, 1, 6],
		102	@b => [nil, 7, 10],
		103	@b2 => [@b.id, 8, 9],
		104	@c => [nil, 11, 14]
		105	})
		106	end
		107	end
		108	end
		109	end
		110
		111	def assert_nested_set_values(h)
		112	assert Project.valid?
		113	h.each do \|project, expected\|
		114	project.reload
		115	assert_equal expected, [project.parent_id, project.lft, project.rgt], "Unexpected nested set values for #{project.name}"
		116	end
57	end	117	end
58	end No newline at end of file	118	end

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