Skip to content

Commit fc622a8

Browse files
authored
Merge pull request openSUSE#18978 from eduardoj/fix/revert_backend_api_refactorings
Revert Backend::Api refactorings with boolean parameters
2 parents f3ca670 + ca34227 commit fc622a8

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/api/app/controllers/source_package_controller.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ def delete
6161
def show_file
6262
project_name = params[:project]
6363
package_name = params[:package] || '_project'
64+
file = params[:filename]
6465

6566
if params.key?(:deleted)
6667
if package_name == '_project'
@@ -79,9 +80,9 @@ def show_file
7980
end
8081
end
8182

82-
backend_params = params.slice(*%i[rev meta deleted limit expand view]).permit!.to_h
83-
84-
send_data(Backend::Api::Sources::File.content(project_name, package_name, params[:filename], backend_params))
83+
path = Package.source_path(project_name, package_name, file)
84+
path += build_query_from_hash(params, %i[rev meta deleted limit expand view])
85+
pass_to_backend(path)
8586
end
8687

8788
# PUT /source/:project/:package/:filename

src/api/app/controllers/source_package_meta_controller.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ def show
3030
end
3131

3232
# Let the backend answer for deleted or remote packages. For specific revisions or the blame view. Or if the meta parameter is used.
33-
meta_params = params.slice(:deleted, :meta, :rev, :view).permit!.to_h
34-
if meta_params.any? || pack.nil?
35-
render xml: Backend::Api::Sources::Package.meta(@project_name, @package_name, meta_params)
33+
if params.key?(:deleted) || params.key?(:meta) || params.key?(:rev) || params.key?(:view) || pack.nil?
34+
path = request.path_info
35+
path += build_query_from_hash(params, %i[deleted meta rev view])
36+
pass_to_backend(path)
3637
return
3738
end
3839

0 commit comments

Comments
 (0)