jro_apps/redmine Commit - r9570:b88c95b0fb94

Merged r9740 and r9741 from trunk....

Jean-Philippe Lang -

r9570:b88c95b0fb94

parent child

Context file:

r9570:b88c95b0fb94

Collapse all files

app/controllers/timelog_controller.rb +16 -8

             class TimelogController < ApplicationController
               menu_item :issues
-              before_filter :find_project, :only => [:create]
+              before_filter :find_project_for_new_time_entry, :only => [:create]
               before_filter :find_time_entry, :only => [:show, :edit, :update]
               before_filter :find_time_entries, :only => [:bulk_edit, :bulk_update, :destroy]
               before_filter :authorize, :except => [:new, :index, :report]
-              before_filter :find_optional_project, :only => [:new, :index, :report]
+              before_filter :find_optional_project, :only => [:index, :report]
+              before_filter :find_optional_project_for_new_time_entry, :only => [:new]
               before_filter :authorize_global, :only => [:new, :index, :report]
               accept_rss_auth :index
                       flash[:notice] = l(:notice_successful_create)
                       if params[:continue]
                         if params[:project_id]
-                          redirect_to :action => 'new', :project_id => @time_entry.project, :issue_id => @time_entry.issue, :back_url => params[:back_url]
+                          redirect_to :action => 'new', :project_id => @time_entry.project, :issue_id => @time_entry.issue,
+                            :time_entry => {:issue_id => @time_entry.issue_id, :activity_id => @time_entry.activity_id},
+                            :back_url => params[:back_url]
                         else
-                          redirect_to :action => 'new', :back_url => params[:back_url]
+                          redirect_to :action => 'new',
+                            :time_entry => {:project_id => @time_entry.project_id, :issue_id => @time_entry.issue_id, :activity_id => @time_entry.activity_id},
+                            :back_url => params[:back_url]
                         end
                       else
                         redirect_back_or_default :action => 'index', :project_id => @time_entry.project
                 end
               end
-              def find_project
+              def find_optional_project_for_new_time_entry
                 if (project_id = (params[:project_id] || params[:time_entry] && params[:time_entry][:project_id])).present?
                   @project = Project.find(project_id)
                 end
                   @issue = Issue.find(issue_id)
                   @project ||= @issue.project
                 end
+              rescue ActiveRecord::RecordNotFound
+                render_404
+              end
+              def find_project_for_new_time_entry
+                find_optional_project_for_new_time_entry
                 if @project.nil?
                   render_404
-                  return false
                 end
-              rescue ActiveRecord::RecordNotFound
-                render_404
               end
               def find_optional_project

app/views/timelog/new.html.erb +1 0

             <h2><%= l(:label_spent_time) %></h2>
             <%= labelled_form_for @time_entry, :url => time_entries_path do |f| %>
+              <%= hidden_field_tag 'project_id', params[:project_id] if params[:project_id] %>
               <%= render :partial => 'form', :locals => {:f => f} %>
               <%= submit_tag l(:button_create) %>
               <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>

test/functional/timelog_controller_test.rb +16 -3

                 # Default activity selected
                 assert_tag :tag => 'option', :attributes => { :selected => 'selected' },
                                              :content => 'Development'
+                assert_select 'input[name=project_id][value=1]'
               end
               def test_get_new_should_only_show_active_time_entry_activities
                 assert_response :success
                 assert_template 'new'
                 assert_tag 'select', :attributes => {:name => 'time_entry[project_id]'}
+                assert_select 'input[name=project_id]', 0
+              end
+              def test_new_without_project_should_prefill_the_form
+                @request.session[:user_id] = 3
+                get :new, :time_entry => {:project_id => '1'}
+                assert_response :success
+                assert_template 'new'
+                assert_select 'select[name=?]', 'time_entry[project_id]' do
+                  assert_select 'option[value=1][selected=selected]'
+                end
+                assert_select 'input[name=project_id]', 0
               end
               def test_new_without_project_should_deny_without_permission
                                             :spent_on => '2008-03-14',
                                             :hours => '7.3'},
                             :continue => '1'
-                assert_redirected_to '/projects/ecookbook/time_entries/new'
+                assert_redirected_to '/projects/ecookbook/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D='
               end
               def test_create_and_continue_with_issue_id
                                             :spent_on => '2008-03-14',
                                             :hours => '7.3'},
                             :continue => '1'
-                assert_redirected_to '/projects/ecookbook/issues/1/time_entries/new'
+                assert_redirected_to '/projects/ecookbook/issues/1/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D=1'
               end
               def test_create_and_continue_without_project
                                             :hours => '7.3'},
                               :continue => '1'
-                assert_redirected_to '/time_entries/new'
+                assert_redirected_to '/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D=&time_entry%5Bproject_id%5D=1'
               end
               def test_create_without_log_time_permission_should_be_denied

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