jro_apps/redmine Commit - r13905:216a153421b0

Update activities list when changing project/issue id on the time entry form (#19656)....

Jean-Philippe Lang -

r13905:216a153421b0

parent child

Context file:

r13905:216a153421b0

Collapse all files

app/views/timelog/new.js.erb created 644 +1 0

	@@ -0,0 +1,1
				1	$('#time_entry_activity_id').html('<%= escape_javascript options_for_select(activity_collection_for_select_options(@time_entry), @time_entry.activity_id) %>');

test/ui/timelog_test_ui.rb created 644 +44 0

@@ -0,0 +1,44
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2015 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.expand_path('../base', __FILE__)
	19
	20	class Redmine::UiTest::TimelogTest < Redmine::UiTest::Base
	21	fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
	22	:trackers, :projects_trackers, :enabled_modules, :issue_statuses, :issues,
	23	:enumerations, :custom_fields, :custom_values, :custom_fields_trackers
	24
	25	def test_changing_project_should_update_activities
	26	project = Project.find(1)
	27	TimeEntryActivity.create!(:name => 'Design', :project => project, :parent => TimeEntryActivity.find_by_name('Design'), :active => false)
	28
	29	log_user 'jsmith', 'jsmith'
	30	visit '/time_entries/new'
	31	within 'select#time_entry_activity_id' do
	32	assert has_content?('Development')
	33	assert has_content?('Design')
	34	end
	35
	36	within 'form#new_time_entry' do
	37	select 'eCookbook', :from => 'Project'
	38	end
	39	within 'select#time_entry_activity_id' do
	40	assert has_content?('Development')
	41	assert !has_content?('Design')
	42	end
	43	end
	44	end

app/helpers/timelog_helper.rb +1 0

               # is optional and will be used to check if the selected TimeEntryActivity
               # is active.
               def activity_collection_for_select_options(time_entry=nil, project=nil)
+                project ||= time_entry.try(:project)
                 project ||= @project
                 if project.nil?
                   activities = TimeEntryActivity.shared.active

app/views/timelog/_form.html.erb +13 0

@@ -26,9 +26,22
26	</div>	26	</div>
27		27
28	<%= javascript_tag do %>	28	<%= javascript_tag do %>
		29	<% if @time_entry.new_record? %>
		30	$(document).ready(function(){
		31	$('#time_entry_project_id, #time_entry_issue_id').change(function(){
		32	$.ajax({
		33	url: '<%= escape_javascript new_time_entry_path(:format => 'js') %>',
		34	type: 'post',
		35	data: $('#new_time_entry').serialize()
		36	});
		37	});
		38	});
		39	<% end %>
		40
29	observeAutocompleteField('time_entry_issue_id', '<%= escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (@project ? nil : 'all'))%>', {	41	observeAutocompleteField('time_entry_issue_id', '<%= escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (@project ? nil : 'all'))%>', {
30	select: function(event, ui) {	42	select: function(event, ui) {
31	$('#time_entry_issue').text(ui.item.label);	43	$('#time_entry_issue').text(ui.item.label);
		44	$('#time_entry_issue_id').blur();
32	}	45	}
33	});	46	});
34	<% end %>	47	<% end %>

config/routes.rb +2 0

               match '/time_entries/:id', :to => 'timelog#destroy', :via => :delete, :id => /\d+/
               # TODO: delete /time_entries for bulk deletion
               match '/time_entries/destroy', :to => 'timelog#destroy', :via => :delete
+              # Used to update the new time entry form
+              post '/time_entries/new', :to => 'timelog#new'
               get 'projects/:id/activity', :to => 'activities#index', :as => :project_activity
               get 'activity', :to => 'activities#index'

test/functional/timelog_controller_test.rb +7 0

                 assert_select 'option', :text => 'Inactive Activity', :count => 0
               end
+              def test_post_new_as_js_should_update_activity_options
+                @request.session[:user_id] = 3
+                post :new, :time_entry => {:project_id => 1}, :format => 'js'
+                assert_response :success
+                assert_include '#time_entry_activity_id', response.body
+              end
               def test_get_edit_existing_time
                 @request.session[:user_id] = 2
                 get :edit, :id => 2, :project_id => nil

test/integration/routing/timelog_test.rb +1 0

                 should_route 'GET /time_entries.csv' => 'timelog#index', :format => 'csv'
                 should_route 'GET /time_entries.atom' => 'timelog#index', :format => 'atom'
                 should_route 'GET /time_entries/new' => 'timelog#new'
+                should_route 'POST /time_entries/new' => 'timelog#new'
                 should_route 'POST /time_entries' => 'timelog#create'
                 should_route 'GET /time_entries/22/edit' => 'timelog#edit', :id => '22'

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