Skip to content

Commit

Permalink
Merge pull request #15097 from hennevogel/refactoring/includeallpacka…
Browse files Browse the repository at this point in the history
…ges_keyword_argument

Make includeallpackages a boolean keyword argument
  • Loading branch information
hennevogel committed Oct 23, 2023
2 parents 32125ce + a204847 commit 6b59b77
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/api/app/controllers/source_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ def project_command_undelete
def project_command_release
params[:user] = User.session!.login

@project = Project.get_by_name(params[:project], includeallpackages: 1)
@project = Project.get_by_name(params[:project], include_all_packages: true)
verify_release_targets!(@project)

if @project.is_a?(String) # remote project
Expand Down Expand Up @@ -663,7 +663,7 @@ def project_command_copy
raise CmdExecutionNoPermission, "no permission to execute command 'copy'" unless (@project && User.session!.can_modify?(@project)) ||
(@project.nil? && User.session!.can_create_project?(project_name))

oprj = Project.get_by_name(params[:oproject], includeallpackages: 1)
oprj = Project.get_by_name(params[:oproject], include_all_packages: true)
if params.key?(:makeolder) || params.key?(:makeoriginolder)
raise CmdExecutionNoPermission, "no permission to execute command 'copy', requires modification permission in origin project" unless User.session!.can_modify?(oprj)
end
Expand Down
4 changes: 2 additions & 2 deletions src/api/app/models/project.rb
Original file line number Diff line number Diff line change
Expand Up @@ -235,15 +235,15 @@ def check_access?(project)
# - an instance of Project
# - a string for a Project from an interconnect
# - UnknownObjectError or ReadAccessError exceptions
def get_by_name(name, opts = {})
def get_by_name(name, include_all_packages: false)
dbp = find_by_name(name, skip_check_access: true)
if dbp.nil?
dbp, remote_name = find_remote_project(name)
return dbp.name + ':' + remote_name if dbp

raise Project::Errors::UnknownObjectError, "Project not found: #{name}"
end
if opts[:includeallpackages]
if include_all_packages
Package.joins(:flags).where(project_id: dbp.id).where("flags.flag='sourceaccess'").find_each do |pkg|
raise ReadAccessError, name unless Package.check_access?(pkg)
end
Expand Down

0 comments on commit 6b59b77

Please sign in to comment.