jro_apps/redmine Commit - r2836:37d401ac58c3

When a specific TimeEntryActivity are change, associated TimeEntries will be...

Eric Davis -

r2836:37d401ac58c3

parent child

Context file:

r2836:37d401ac58c3

Collapse all files

app/controllers/projects_controller.rb +5 -4

               def save_activities
                 if request.post? && params[:enumerations]
-                  params[:enumerations].each do |id, activity|
+                  Project.transaction do
-                    @project.update_or_build_time_entry_activity(id, activity)
+                    params[:enumerations].each do |id, activity|
+                      @project.update_or_create_time_entry_activity(id, activity)
+                    end
                   end
-                  @project.save
                 end
                 redirect_to :controller => 'projects', :action => 'settings', :tab => 'activities', :id => @project
               def reset_activities
                 @project.time_entry_activities.each do |time_entry_activity|
-                  time_entry_activity.destroy
+                  time_entry_activity.destroy(time_entry_activity.parent)
                 end
                 redirect_to :controller => 'projects', :action => 'settings', :tab => 'activities', :id => @project
               end

app/models/project.rb +18 -7

                 end
               end
-              # Will build a new Project specific Activity or update an existing one
+              # Will create a new Project specific Activity or update an existing one
-              def update_or_build_time_entry_activity(id, activity_hash)
+              # This will raise a ActiveRecord::Rollback if the TimeEntryActivity
+              # does not successfully save.
+              def update_or_create_time_entry_activity(id, activity_hash)
                 if activity_hash.respond_to?(:has_key?) && activity_hash.has_key?('parent_id')
-                  self.build_time_entry_activity_if_needed(activity_hash)
+                  self.create_time_entry_activity_if_needed(activity_hash)
                 else
                   activity = project.time_entry_activities.find_by_id(id.to_i)
                   activity.update_attributes(activity_hash) if activity
                 end
               end
-              # Builds new activity
+              # Create a new TimeEntryActivity if it overrides a system TimeEntryActivity
-              def build_time_entry_activity_if_needed(activity)
-                # Only new override activities are built
+              # This will raise a ActiveRecord::Rollback if the TimeEntryActivity
+              # does not successfully save.
+              def create_time_entry_activity_if_needed(activity)
                 if activity['parent_id']
                   parent_activity = TimeEntryActivity.find(activity['parent_id'])
                   activity['position'] = parent_activity.position
                   if Enumeration.overridding_change?(activity, parent_activity)
-                    self.time_entry_activities.build(activity)
+                    project_activity = self.time_entry_activities.create(activity)
+                    if project_activity.new_record?
+                      raise ActiveRecord::Rollback, "Overridding TimeEntryActivity was not successfully saved"
+                    else
+                      self.time_entries.update_all("activity_id = #{project_activity.id}", ["activity_id = ?", parent_activity.id])
+                    end
                   end
                 end
               end

test/fixtures/time_entries.yml +1 -1

               hours: 7.65
               user_id: 1
               tyear: 2007
-  No newline at end of file

test/functional/projects_controller_test.rb +62 -1

@@ -24,7 +24,7 class ProjectsController; def rescue_action(e) raise e end; end
24	class ProjectsControllerTest < ActionController::TestCase	24	class ProjectsControllerTest < ActionController::TestCase
25	fixtures :projects, :versions, :users, :roles, :members, :member_roles, :issues, :journals, :journal_details,	25	fixtures :projects, :versions, :users, :roles, :members, :member_roles, :issues, :journals, :journal_details,
26	:trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages,	26	:trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages,
27	:attachments, :custom_fields, :custom_values	27	:attachments, :custom_fields, :custom_values, :time_entries
28		28
29	def setup	29	def setup
30	@controller = ProjectsController.new	30	@controller = ProjectsController.new
@@ -586,6 +586,27 class ProjectsControllerTest < ActionController::TestCase
586	assert_nil TimeEntryActivity.find_by_id(project_activity_two.id)	586	assert_nil TimeEntryActivity.find_by_id(project_activity_two.id)
587	end	587	end
588		588
		589	def test_reset_activities_should_reassign_time_entries_back_to_the_system_activity
		590	@request.session[:user_id] = 2 # manager
		591	project_activity = TimeEntryActivity.new({
		592	:name => 'Project Specific Design',
		593	:parent => TimeEntryActivity.find(9),
		594	:project => Project.find(1),
		595	:active => true
		596	})
		597	assert project_activity.save
		598	assert TimeEntry.update_all("activity_id = '#{project_activity.id}'", ["project_id = ? AND activity_id = ?", 1, 9])
		599	assert 3, TimeEntry.find_all_by_activity_id_and_project_id(project_activity.id, 1).size
		600
		601	delete :reset_activities, :id => 1
		602	assert_response :redirect
		603	assert_redirected_to 'projects/ecookbook/settings/activities'
		604
		605	assert_nil TimeEntryActivity.find_by_id(project_activity.id)
		606	assert_equal 0, TimeEntry.find_all_by_activity_id_and_project_id(project_activity.id, 1).size, "TimeEntries still assigned to project specific activity"
		607	assert_equal 3, TimeEntry.find_all_by_activity_id_and_project_id(9, 1).size, "TimeEntries still assigned to project specific activity"
		608	end
		609
589	def test_save_activities_routing	610	def test_save_activities_routing
590	assert_routing({:method => :post, :path => 'projects/64/activities/save'},	611	assert_routing({:method => :post, :path => 'projects/64/activities/save'},
591	:controller => 'projects', :action => 'save_activities', :id => '64')	612	:controller => 'projects', :action => 'save_activities', :id => '64')
@@ -683,6 +704,46 class ProjectsControllerTest < ActionController::TestCase
683	assert !activity_two.active?	704	assert !activity_two.active?
684	end	705	end
685		706
		707	def test_save_activities_when_creating_new_activities_will_convert_existing_data
		708	assert_equal 3, TimeEntry.find_all_by_activity_id_and_project_id(9, 1).size
		709
		710	@request.session[:user_id] = 2 # manager
		711	post :save_activities, :id => 1, :enumerations => {
		712	"9"=> {"parent_id"=>"9", "custom_field_values"=>{"7" => "1"}, "active"=>"0"} # Design, De-activate
		713	}
		714	assert_response :redirect
		715
		716	# No more TimeEntries using the system activity
		717	assert_equal 0, TimeEntry.find_all_by_activity_id_and_project_id(9, 1).size, "Time Entries still assigned to system activities"
		718	# All TimeEntries using project activity
		719	project_specific_activity = TimeEntryActivity.find_by_parent_id_and_project_id(9, 1)
		720	assert_equal 3, TimeEntry.find_all_by_activity_id_and_project_id(project_specific_activity.id, 1).size, "No Time Entries assigned to the project activity"
		721	end
		722
		723	def test_save_activities_when_creating_new_activities_will_not_convert_existing_data_if_an_exception_is_raised
		724	# TODO: Need to cause an exception on create but these tests
		725	# aren't setup for mocking. Just create a record now so the
		726	# second one is a dupicate
		727	parent = TimeEntryActivity.find(9)
		728	TimeEntryActivity.create!({:name => parent.name, :project_id => 1, :position => parent.position, :active => true})
		729	TimeEntry.create!({:project_id => 1, :hours => 1.0, :user => User.find(1), :issue_id => 3, :activity_id => 10, :spent_on => '2009-01-01'})
		730
		731	assert_equal 3, TimeEntry.find_all_by_activity_id_and_project_id(9, 1).size
		732	assert_equal 1, TimeEntry.find_all_by_activity_id_and_project_id(10, 1).size
		733
		734	@request.session[:user_id] = 2 # manager
		735	post :save_activities, :id => 1, :enumerations => {
		736	"9"=> {"parent_id"=>"9", "custom_field_values"=>{"7" => "1"}, "active"=>"0"}, # Design
		737	"10"=> {"parent_id"=>"10", "custom_field_values"=>{"7"=>"0"}, "active"=>"1"} # Development, Change custom value
		738	}
		739	assert_response :redirect
		740
		741	# TimeEntries shouldn't have been reassigned on the failed record
		742	assert_equal 3, TimeEntry.find_all_by_activity_id_and_project_id(9, 1).size, "Time Entries are not assigned to system activities"
		743	# TimeEntries shouldn't have been reassigned on the saved record either
		744	assert_equal 1, TimeEntry.find_all_by_activity_id_and_project_id(10, 1).size, "Time Entries are not assigned to system activities"
		745	end
		746
686	# A hook that is manually registered later	747	# A hook that is manually registered later
687	class ProjectBasedTemplate < Redmine::Hook::ViewListener	748	class ProjectBasedTemplate < Redmine::Hook::ViewListener
688	def view_layouts_base_html_head(context)	749	def view_layouts_base_html_head(context)

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