jro_apps/redmine Commit - r3317:0ef11ef4fe61

Merged bug fixes r3402, r3405 to r3408 from trunk....

Jean-Philippe Lang -

r3317:0ef11ef4fe61

parent child

Context file:

r3317:0ef11ef4fe61

Collapse all files

app/controllers/projects_controller.rb +1 -5

                 @issues_by_version = {}
                 unless @selected_tracker_ids.empty?
                   @versions.each do |version|
-                    conditions = {:tracker_id => @selected_tracker_ids}
-                    if !@project.versions.include?(version)
-                      conditions.merge!(:project_id => project_ids)
-                    end
                     issues = version.fixed_issues.visible.find(:all,
                                                                :include => [:project, :status, :tracker, :priority],
-                                                               :conditions => conditions,
+                                                               :conditions => {:tracker_id => @selected_tracker_ids, :project_id => project_ids},
                                                                :order => "#{Project.table_name}.lft, #{Tracker.table_name}.position, #{Issue.table_name}.id")
                     @issues_by_version[version] = issues
                   end

app/models/project.rb +1 -1

                 return @allowed_parents if @allowed_parents
                 @allowed_parents = Project.find(:all, :conditions => Project.allowed_to_condition(User.current, :add_subprojects))
                 @allowed_parents = @allowed_parents - self_and_descendants
-                if User.current.allowed_to?(:add_project, nil, :global => true)
+                if User.current.allowed_to?(:add_project, nil, :global => true) || (!new_record? && parent.nil?)
                   @allowed_parents << nil
                 end
                 unless parent.nil? || @allowed_parents.empty? || @allowed_parents.include?(parent)

app/models/repository.rb +7 -3

                 end
               end
-              # fetch new changesets for all repositories
+              # Fetches new changesets for all repositories of active projects
-              # can be called periodically by an external script
+              # Can be called periodically by an external script
               # eg. ruby script/runner "Repository.fetch_changesets"
               def self.fetch_changesets
-                find(:all).each(&:fetch_changesets)
+                Project.active.has_module(:repository).find(:all, :include => :repository).each do |project|
+                  if project.repository
+                    project.repository.fetch_changesets
+                  end
+                end
               end
               # scan changeset comments to find related and fixed issues for all repositories

app/views/issues/gantt.rhtml +1 -3

                   	<%= link_to_issue i %>
               	<% else %>
             		<span class="icon icon-package">
-            	      	<%= h("#{i.project} -") unless @project && @project == i.project %>
             	      	<%= link_to_version i %>
             		</span>
               	<% end %>
                 %>
                 <div style="top:<%= top %>px;left:<%= i_left %>px;width:15px;" class="task milestone">&nbsp;</div>
             	<div style="top:<%= top %>px;left:<%= i_left + 12 %>px;background:#fff;" class="task">
-            		<%= h("#{i.project} -") unless @project && @project == i.project %>
+            		<strong><%= format_version_name i %></strong>
-            		<strong><%=h i %></strong>
             	</div>
             <% end %>
             	<% top = top + 20

test/unit/project_test.rb +42 0

@@ -285,6 +285,48 class ProjectTest < ActiveSupport::TestCase
285	assert Project.new.allowed_parents.compact.empty?	285	assert Project.new.allowed_parents.compact.empty?
286	end	286	end
287		287
		288	def test_allowed_parents_with_add_subprojects_permission
		289	Role.find(1).remove_permission!(:add_project)
		290	Role.find(1).add_permission!(:add_subprojects)
		291	User.current = User.find(2)
		292	# new project
		293	assert !Project.new.allowed_parents.include?(nil)
		294	assert Project.new.allowed_parents.include?(Project.find(1))
		295	# existing root project
		296	assert Project.find(1).allowed_parents.include?(nil)
		297	# existing child
		298	assert Project.find(3).allowed_parents.include?(Project.find(1))
		299	assert !Project.find(3).allowed_parents.include?(nil)
		300	end
		301
		302	def test_allowed_parents_with_add_project_permission
		303	Role.find(1).add_permission!(:add_project)
		304	Role.find(1).remove_permission!(:add_subprojects)
		305	User.current = User.find(2)
		306	# new project
		307	assert Project.new.allowed_parents.include?(nil)
		308	assert !Project.new.allowed_parents.include?(Project.find(1))
		309	# existing root project
		310	assert Project.find(1).allowed_parents.include?(nil)
		311	# existing child
		312	assert Project.find(3).allowed_parents.include?(Project.find(1))
		313	assert Project.find(3).allowed_parents.include?(nil)
		314	end
		315
		316	def test_allowed_parents_with_add_project_and_subprojects_permission
		317	Role.find(1).add_permission!(:add_project)
		318	Role.find(1).add_permission!(:add_subprojects)
		319	User.current = User.find(2)
		320	# new project
		321	assert Project.new.allowed_parents.include?(nil)
		322	assert Project.new.allowed_parents.include?(Project.find(1))
		323	# existing root project
		324	assert Project.find(1).allowed_parents.include?(nil)
		325	# existing child
		326	assert Project.find(3).allowed_parents.include?(Project.find(1))
		327	assert Project.find(3).allowed_parents.include?(nil)
		328	end
		329
288	def test_users_by_role	330	def test_users_by_role
289	users_by_role = Project.find(1).users_by_role	331	users_by_role = Project.find(1).users_by_role
290	assert_kind_of Hash, users_by_role	332	assert_kind_of Hash, users_by_role

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