From 339a6212effb4ac1a9e17ff3059c67439a957928 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Mon, 26 Jun 2017 19:53:09 +0000 Subject: [PATCH] Use ApplicationController#find_optional_project instead. git-svn-id: http://svn.redmine.org/redmine/trunk@16722 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/timelog_controller.rb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb index 18b911c52..b45d3078f 100644 --- a/app/controllers/timelog_controller.rb +++ b/app/controllers/timelog_controller.rb @@ -25,7 +25,6 @@ class TimelogController < ApplicationController before_action :find_optional_issue, :only => [:new, :create] before_action :find_optional_project, :only => [:index, :report] - before_action :authorize_global, :only => [:new, :create, :index, :report] accept_rss_auth :index accept_api_auth :index, :show, :create, :update, :destroy @@ -261,19 +260,12 @@ private if params[:issue_id].present? @issue = Issue.find(params[:issue_id]) @project = @issue.project + authorize else find_optional_project end end - def find_optional_project - if params[:project_id].present? - @project = Project.find(params[:project_id]) - end - rescue ActiveRecord::RecordNotFound - render_404 - end - # Returns the TimeEntry scope for index and report actions def time_entry_scope(options={}) @query.results_scope(options) -- 2.39.5