jro_apps/redmine Commit - r11605:2a6dadf78799

Merged r11762 and r11763 from trunk (#13783)....

Jean-Philippe Lang -

r11605:2a6dadf78799

parent child

Context file:

r11605:2a6dadf78799

app/controllers/enumerations_controller.rb +1 -1

                     return
                   end
                 end
-                @enumerations = @enumeration.class.all - [@enumeration]
+                @enumerations = @enumeration.class.system.all - [@enumeration]
               end
               private

app/models/enumeration.rb +1 0

               scope :shared, lambda { where(:project_id => nil) }
               scope :sorted, lambda { order("#{table_name}.position ASC") }
               scope :active, lambda { where(:active => true) }
+              scope :system, lambda { where(:project_id => nil) }
               scope :named, lambda {|arg| where("LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip)}
               def self.default

app/models/time_entry_activity.rb +6 -2

                 OptionName
               end
+              def objects
+                TimeEntry.where(:activity_id => self_and_descendants(1).map(&:id))
+              end
               def objects_count
-                time_entries.count
+                objects.count
               end
               def transfer_relations(to)
-                time_entries.update_all("activity_id = #{to.id}")
+                objects.update_all(:activity_id => to.id)
               end
             end

test/object_helpers.rb +2 -1

               def TimeEntry.generate!(attributes={})
                 entry = TimeEntry.new(attributes)
                 entry.user ||= User.find(2)
-                entry.issue ||= Issue.find(1)
+                entry.issue ||= Issue.find(1) unless entry.project
                 entry.project ||= entry.issue.project
                 entry.activity ||= TimeEntryActivity.first
                 entry.spent_on ||= Date.today
+                entry.hours ||= 1.0
                 entry.save!
                 entry
               end

test/unit/time_entry_activity_test.rb +29 -1

@@ -84,5 +84,33 class TimeEntryActivityTest < ActiveSupport::TestCase
84	e.reload	84	e.reload
85	assert_equal "0", e.custom_value_for(field).value	85	assert_equal "0", e.custom_value_for(field).value
86	end	86	end
87	end
88		87
		88	def test_system_activity_with_child_in_use_should_be_in_use
		89	project = Project.generate!
		90	system_activity = TimeEntryActivity.create!(:name => 'Activity')
		91	project_activity = TimeEntryActivity.create!(:name => 'Activity', :project => project, :parent_id => system_activity.id)
		92
		93	TimeEntry.generate!(:project => project, :activity => project_activity)
		94
		95	assert project_activity.in_use?
		96	assert system_activity.in_use?
		97	end
		98
		99	def test_destroying_a_system_activity_should_reassign_children_activities
		100	project = Project.generate!
		101	system_activity = TimeEntryActivity.create!(:name => 'Activity')
		102	project_activity = TimeEntryActivity.create!(:name => 'Activity', :project => project, :parent_id => system_activity.id)
		103
		104	entries = [
		105	TimeEntry.generate!(:project => project, :activity => system_activity),
		106	TimeEntry.generate!(:project => project, :activity => project_activity)
		107	]
		108
		109	assert_difference 'TimeEntryActivity.count', -2 do
		110	assert_nothing_raised do
		111	assert system_activity.destroy(TimeEntryActivity.find_by_name('Development'))
		112	end
		113	end
		114	assert entries.all? {\|entry\| entry.reload.activity.name == 'Development'}
		115	end
		116	end

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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