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

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

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 %>

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) %>');

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'

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

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'

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