diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-05-30 08:38:35 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-05-30 08:38:35 +0000 |
| commit | 216a153421b05bce4d4e64b590889b740367b92e (patch) | |
| tree | a01c6009db7d9aefc80ea09b073e1ca48131ffab | |
| parent | affeabcc526449057b29ca636f456234a87798b6 (diff) | |
| download | redmine-216a153421b05bce4d4e64b590889b740367b92e.tar.gz redmine-216a153421b05bce4d4e64b590889b740367b92e.zip | |
Update activities list when changing project/issue id on the time entry form (#19656).
git-svn-id: http://svn.redmine.org/redmine/trunk@14287 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/helpers/timelog_helper.rb | 1 | ||||
| -rw-r--r-- | app/views/timelog/_form.html.erb | 13 | ||||
| -rw-r--r-- | app/views/timelog/new.js.erb | 1 | ||||
| -rw-r--r-- | config/routes.rb | 2 | ||||
| -rw-r--r-- | test/functional/timelog_controller_test.rb | 7 | ||||
| -rw-r--r-- | test/integration/routing/timelog_test.rb | 1 | ||||
| -rw-r--r-- | test/ui/timelog_test_ui.rb | 44 |
7 files changed, 69 insertions, 0 deletions
diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb index f4a97bcab..106a8943c 100644 --- a/app/helpers/timelog_helper.rb +++ b/app/helpers/timelog_helper.rb @@ -38,6 +38,7 @@ module TimelogHelper # 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 diff --git a/app/views/timelog/_form.html.erb b/app/views/timelog/_form.html.erb index 9b078013d..cf665cb63 100644 --- a/app/views/timelog/_form.html.erb +++ b/app/views/timelog/_form.html.erb @@ -26,9 +26,22 @@ </div> <%= javascript_tag do %> +<% if @time_entry.new_record? %> + $(document).ready(function(){ + $('#time_entry_project_id, #time_entry_issue_id').change(function(){ + $.ajax({ + url: '<%= escape_javascript new_time_entry_path(:format => 'js') %>', + type: 'post', + data: $('#new_time_entry').serialize() + }); + }); + }); +<% end %> + observeAutocompleteField('time_entry_issue_id', '<%= escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (@project ? nil : 'all'))%>', { select: function(event, ui) { $('#time_entry_issue').text(ui.item.label); + $('#time_entry_issue_id').blur(); } }); <% end %> diff --git a/app/views/timelog/new.js.erb b/app/views/timelog/new.js.erb new file mode 100644 index 000000000..f76cbb84f --- /dev/null +++ b/app/views/timelog/new.js.erb @@ -0,0 +1 @@ +$('#time_entry_activity_id').html('<%= escape_javascript options_for_select(activity_collection_for_select_options(@time_entry), @time_entry.activity_id) %>'); diff --git a/config/routes.rb b/config/routes.rb index 142fa915f..30cb694ff 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -215,6 +215,8 @@ Rails.application.routes.draw do 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' diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb index 1d925f6bf..1d4097ce2 100644 --- a/test/functional/timelog_controller_test.rb +++ b/test/functional/timelog_controller_test.rb @@ -95,6 +95,13 @@ class TimelogControllerTest < ActionController::TestCase 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 diff --git a/test/integration/routing/timelog_test.rb b/test/integration/routing/timelog_test.rb index 1c7693fbc..c84f22eec 100644 --- a/test/integration/routing/timelog_test.rb +++ b/test/integration/routing/timelog_test.rb @@ -23,6 +23,7 @@ class RoutingTimelogsTest < Redmine::RoutingTest 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' diff --git a/test/ui/timelog_test_ui.rb b/test/ui/timelog_test_ui.rb new file mode 100644 index 000000000..fc07b29da --- /dev/null +++ b/test/ui/timelog_test_ui.rb @@ -0,0 +1,44 @@ +# Redmine - project management software +# Copyright (C) 2006-2015 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +require File.expand_path('../base', __FILE__) + +class Redmine::UiTest::TimelogTest < Redmine::UiTest::Base + fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles, + :trackers, :projects_trackers, :enabled_modules, :issue_statuses, :issues, + :enumerations, :custom_fields, :custom_values, :custom_fields_trackers + + def test_changing_project_should_update_activities + project = Project.find(1) + TimeEntryActivity.create!(:name => 'Design', :project => project, :parent => TimeEntryActivity.find_by_name('Design'), :active => false) + + log_user 'jsmith', 'jsmith' + visit '/time_entries/new' + within 'select#time_entry_activity_id' do + assert has_content?('Development') + assert has_content?('Design') + end + + within 'form#new_time_entry' do + select 'eCookbook', :from => 'Project' + end + within 'select#time_entry_activity_id' do + assert has_content?('Development') + assert !has_content?('Design') + end + end +end |