jro_apps/redmine Commit - r4130:4acd990ee295

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

Eric Davis -

r4130:4acd990ee295

parent child

Context file:

r4130:4acd990ee295

Collapse all files

app/controllers/timelog_controller.rb +16 -1

              class TimelogController < ApplicationController
                menu_item :issues
-               before_filter :find_project, :authorize, :only => [:new, :edit, :destroy]
+               before_filter :find_project, :authorize, :only => [:new, :create, :edit, :destroy]
                before_filter :find_optional_project, :only => [:index]
                verify :method => :post, :only => :destroy, :redirect_to => { :action => :index }
                  call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
                  render :action => 'edit'
                end
+               verify :method => :post, :only => :create, :render => {:nothing => true, :status => :method_not_allowed }
+               def create
+                 @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 })
+                 if @time_entry.save
+                   flash[:notice] = l(:notice_successful_update)
+                   redirect_back_or_default :action => 'index', :project_id => @time_entry.project
+                 else
+                   render :action => 'edit'
+                 end
+               end
                def edit
                  (render_403; return) if @time_entry && !@time_entry.editable_by?(User.current)

app/views/timelog/edit.rhtml +1 -1

              <h2><%= l(:label_spent_time) %></h2>
-             <% labelled_tabular_form_for :time_entry, @time_entry, :url => {:action => 'edit', :id => @time_entry, :project_id => @time_entry.project} do |f| %>
+             <% labelled_tabular_form_for :time_entry, @time_entry, :url => {:action => (@time_entry.new_record? ? 'create' : 'edit'), :id => @time_entry, :project_id => @time_entry.project} do |f| %>
              <%= error_messages_for 'time_entry' %>
              <%= back_url_hidden_field_tag %>

config/routes.rb +2 -1

                  timelog.with_options :action => 'new', :conditions => {:method => :get} do |time_edit|
                    time_edit.connect 'issues/:issue_id/time_entries/new'
                  end
+                 timelog.connect 'projects/:project_id/timelog/edit', :action => 'create', :conditions => {:method => :post}
                  timelog.connect 'time_entries/:id/destroy', :action => 'destroy', :conditions => {:method => :post}
                end

lib/redmine.rb +3 -3

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

test/functional/timelog_controller_test.rb +2 -2

                  assert_tag :tag => 'option', :content => '--- Please select ---'
                end
-               def test_post_edit
+               def test_post_create
                  # TODO: should POST to issues’ time log instead of project. change form
                  # and routing
                  @request.session[:user_id] = 3
-                 post :edit, :project_id => 1,
+                 post :create, :project_id => 1,
                              :time_entry => {:comments => 'Some work on TimelogControllerTest',
                                              # Not the default activity
                                              :activity_id => '11',

test/integration/routing_test.rb +1 0

                  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, "/projects/ecookbook/timelog/edit", :controller => 'timelog', :action => 'create', :project_id => 'ecookbook'
                  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