Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-15 17:56:03 +01:00
Code Issues Packages Projects Releases Activity

Reverted r19669 and r19670 (#32774).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@19675 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2020-04-05 17:29:53 +00:00
parent 895fc12d56
commit d955672a7d
2 changed files with 2 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/timelog_controller.rb
View File

@@ -279,9 +279,8 @@ class TimelogController < ApplicationController
end
def find_optional_issue
if params[:issue_id].present? || params[:time_entry].present? && params[:time_entry][:issue_id].present?
issue_id = params[:issue_id] || params[:time_entry][:issue_id]
@issue = Issue.find(issue_id)
if params[:issue_id].present?
@issue = Issue.find(params[:issue_id])
@project = @issue.project
authorize
else
@@ -289,14 +288,6 @@ class TimelogController < ApplicationController
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
def time_entry_scope(options={})
@query.results_scope(options)

38
test/integration/api_test/time_entries_test.rb
View File

@@ -144,44 +144,6 @@ class Redmine::ApiTest::TimeEntriesTest < Redmine::ApiTest::Base
assert_select 'errors error', :text => "Hours cannot be blank"
end
test "POST /time_entries.xml with :project_id 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'))
assert_response :created
end
entry = TimeEntry.order('id DESC').first
assert_equal 3, entry.user_id
assert_equal 2, entry.author_id
end
test "POST /time_entries.xml with :issue_id 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 =>
{:issue_id => '1', :spent_on => '2010-12-02', :user_id => '3',
:hours => '3.5', :activity_id => '11'}},
:headers => credentials('jsmith'))
assert_response :created
end
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
assert_no_difference 'TimeEntry.count' do
put(