mirror of
https://github.com/redmine/redmine.git
synced 2025-11-07 13:55:52 +01:00
Creating time tracking entry for other user through rest API fails with 403 (#32774).
Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@19669 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -288,6 +288,14 @@ class TimelogController < ApplicationController
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def find_optional_project
|
||||||
|
if params[:project_id].present? || params[:time_entry].present? && params[:time_entry][:project_id].present?
|
||||||
|
project_id = params[:project_id] || params[:time_entry][:project_id]
|
||||||
|
find_project(project_id)
|
||||||
|
end
|
||||||
|
authorize_global
|
||||||
|
end
|
||||||
|
|
||||||
# Returns the TimeEntry scope for index and report actions
|
# Returns the TimeEntry scope for index and report actions
|
||||||
def time_entry_scope(options={})
|
def time_entry_scope(options={})
|
||||||
@query.results_scope(options)
|
@query.results_scope(options)
|
||||||
|
|||||||
@@ -144,6 +144,27 @@ class Redmine::ApiTest::TimeEntriesTest < Redmine::ApiTest::Base
|
|||||||
assert_select 'errors error', :text => "Hours cannot be blank"
|
assert_select 'errors error', :text => "Hours cannot be blank"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "POST /time_entries.xml for other user" do
|
||||||
|
Role.find_by_name('Manager').add_permission! :log_time_for_other_users
|
||||||
|
|
||||||
|
assert_difference 'TimeEntry.count' do
|
||||||
|
post(
|
||||||
|
'/time_entries.xml',
|
||||||
|
:params =>
|
||||||
|
{:time_entry =>
|
||||||
|
{:project_id => '1', :spent_on => '2010-12-02', :user_id => '3',
|
||||||
|
:hours => '3.5', :activity_id => '11'}},
|
||||||
|
:headers => credentials('jsmith'))
|
||||||
|
end
|
||||||
|
assert_response :created
|
||||||
|
|
||||||
|
assert_equal 'application/xml', @response.content_type
|
||||||
|
|
||||||
|
entry = TimeEntry.order('id DESC').first
|
||||||
|
assert_equal 3, entry.user_id
|
||||||
|
assert_equal 2, entry.author_id
|
||||||
|
end
|
||||||
|
|
||||||
test "PUT /time_entries/:id.xml with valid parameters should update time entry" do
|
test "PUT /time_entries/:id.xml with valid parameters should update time entry" do
|
||||||
assert_no_difference 'TimeEntry.count' do
|
assert_no_difference 'TimeEntry.count' do
|
||||||
put(
|
put(
|
||||||
|
|||||||
Reference in New Issue
Block a user