diff --git a/app/controllers/hourglass_completion_controller.rb b/app/controllers/hourglass_completion_controller.rb index 5294f00..375cba0 100644 --- a/app/controllers/hourglass_completion_controller.rb +++ b/app/controllers/hourglass_completion_controller.rb @@ -15,7 +15,8 @@ def issues end was_admin = User.current.admin? User.current.admin = false # prevent Redmine from ignoring permissions for admins, like we do later anyways - issues = Issue.cross_project_scope(params[:project_id]).visible + project = params[:project_id].present? ? Project.find(params[:project_id]) : nil + issues = Issue.cross_project_scope(project).visible issues = issues.joins(:project).where(Project.allowed_to_one_of_condition User.current, Hourglass::AccessControl.permissions_from_action(controller: 'hourglass/time_logs', action: 'book')).where( issue_arel[:id].eq(params[:term].to_i) .or(id_as_text.matches("%#{params[:term]}%")) diff --git a/lib/hourglass.rb b/lib/hourglass.rb index 2ca918f..3a81d08 100644 --- a/lib/hourglass.rb +++ b/lib/hourglass.rb @@ -3,7 +3,7 @@ module Hourglass PLUGIN_NAME = "redmine_#{NAMESPACE}".to_sym PLUGIN_ROOT = Pathname.new(File.join File.dirname(__FILE__), '..').cleanpath - VERSION = '1.2.0-beta1' + VERSION = '1.2.0-beta2' def self.redmine_has_advanced_queries? Redmine::VERSION::MAJOR > 3 || (Redmine::VERSION::MAJOR == 3 && Redmine::VERSION::MINOR >= 4)