jro_apps/redmine Commit - r4125:068771ea0764

Refactor: extract TimelogController#new from #edit...

Eric Davis -

r4125:068771ea0764

parent child

Context file:

r4125:068771ea0764

Collapse all files

app/controllers/timelog_controller.rb +9 -1

             class TimelogController < ApplicationController
               menu_item :issues
-              before_filter :find_project, :authorize, :only => [:edit, :destroy]
+              before_filter :find_project, :authorize, :only => [:new, :edit, :destroy]
               before_filter :find_optional_project, :only => [:index]
               verify :method => :post, :only => :destroy, :redirect_to => { :action => :index }
                   end
                 end
               end
+              def new
+                @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
+                @time_entry.attributes = params[:time_entry]
+                call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
+                render :action => 'edit'
+              end
               def edit
                 (render_403; return) if @time_entry && !@time_entry.editable_by?(User.current)

app/views/time_entry_reports/report.rhtml +1 -1

             <div class="contextual">
-            <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time-add' %>
+            <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'new', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time-add' %>
             </div>
             <%= render_timelog_breadcrumb %>

app/views/timelog/index.html.erb +1 -1

             <div class="contextual">
-            <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time-add' %>
+            <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'new', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time-add' %>
             </div>
             <%= render_timelog_breadcrumb %>

config/routes.rb +3 -3

               map.connect 'help/:ctrl/:page', :controller => 'help'
               map.connect 'time_entries/:id/edit', :action => 'edit', :controller => 'timelog'
-              map.connect 'projects/:project_id/time_entries/new', :action => 'edit', :controller => 'timelog'
+              map.connect 'projects/:project_id/time_entries/new', :action => 'new', :controller => 'timelog'
-              map.connect 'projects/:project_id/issues/:issue_id/time_entries/new', :action => 'edit', :controller => 'timelog'
+              map.connect 'projects/:project_id/issues/:issue_id/time_entries/new', :action => 'new', :controller => 'timelog'
               map.with_options :controller => 'timelog' do |timelog|
                 timelog.connect 'projects/:project_id/time_entries', :action => 'index'
                   time_report.connect 'projects/:project_id/time_entries/report.:format'
                 end
-                timelog.with_options :action => 'edit', :conditions => {:method => :get} do |time_edit|
+                timelog.with_options :action => 'new', :conditions => {:method => :get} do |time_edit|
                   time_edit.connect 'issues/:issue_id/time_entries/new'
                 end

lib/redmine.rb +2 -2

               map.project_module :time_tracking do |map|
                 map.permission :log_time, {:timelog => :edit}, :require => :loggedin
                 map.permission :view_time_entries, :timelog => [:index], :time_entry_reports => [:report]
-                map.permission :edit_time_entries, {:timelog => [:edit, :destroy]}, :require => :member
+                map.permission :edit_time_entries, {:timelog => [:new, :edit, :destroy]}, :require => :member
-                map.permission :edit_own_time_entries, {:timelog => [:edit, :destroy]}, :require => :loggedin
+                map.permission :edit_own_time_entries, {:timelog => [:new, :edit, :destroy]}, :require => :loggedin
                 map.permission :manage_project_activities, {:project_enumerations => [:update, :destroy]}, :require => :member
               end

test/functional/timelog_controller_test.rb +11 -11

                 @response   = ActionController::TestResponse.new
               end
-              def test_get_edit
+              def test_get_new
                 @request.session[:user_id] = 3
-                get :edit, :project_id => 1
+                get :new, :project_id => 1
                 assert_response :success
                 assert_template 'edit'
                 # Default activity selected
                                              :content => 'Development'
               end
+              def test_get_new_should_only_show_active_time_entry_activities
+                @request.session[:user_id] = 3
+                get :new, :project_id => 1
+                assert_response :success
+                assert_template 'edit'
+                assert_no_tag :tag => 'option', :content => 'Inactive Activity'
+              end
               def test_get_edit_existing_time
                 @request.session[:user_id] = 2
                 get :edit, :id => 2, :project_id => nil
                 assert_tag :tag => 'form', :attributes => { :action => '/projects/ecookbook/timelog/edit/2' }
               end
-              def test_get_edit_should_only_show_active_time_entry_activities
-                @request.session[:user_id] = 3
-                get :edit, :project_id => 1
-                assert_response :success
-                assert_template 'edit'
-                assert_no_tag :tag => 'option', :content => 'Inactive Activity'
-              end
               def test_get_edit_with_an_existing_time_entry_with_inactive_activity
                 te = TimeEntry.find(1)
                 te.activity = TimeEntryActivity.find_by_name("Inactive Activity")

test/integration/routing_test.rb +4 -3

                 should_route :get, "/issues/234/time_entries.atom", :controller => 'timelog', :action => 'index', :issue_id => '234', :format => 'atom'
                 should_route :get, "/projects/ecookbook/issues/123/time_entries", :controller => 'timelog', :action => 'index', :project_id => 'ecookbook', :issue_id => '123'
-                should_route :get, "/issues/567/time_entries/new", :controller => 'timelog', :action => 'edit', :issue_id => '567'
+                should_route :get, "/issues/567/time_entries/new", :controller => 'timelog', :action => 'new', :issue_id => '567'
-                should_route :get, "/projects/ecookbook/time_entries/new", :controller => 'timelog', :action => 'edit', :project_id => 'ecookbook'
+                should_route :get, "/projects/ecookbook/time_entries/new", :controller => 'timelog', :action => 'new', :project_id => 'ecookbook'
-                should_route :get, "/projects/ecookbook/issues/567/time_entries/new", :controller => 'timelog', :action => 'edit', :project_id => 'ecookbook', :issue_id => '567'
+                should_route :get, "/projects/ecookbook/issues/567/time_entries/new", :controller => 'timelog', :action => 'new', :project_id => 'ecookbook', :issue_id => '567'
                 should_route :get, "/time_entries/22/edit", :controller => 'timelog', :action => 'edit', :id => '22'
+                should_route :post, "/time_entries/22/edit", :controller => 'timelog', :action => 'edit', :id => '22'
                 should_route :post, "/time_entries/55/destroy", :controller => 'timelog', :action => 'destroy', :id => '55'
               end

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