Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use resources instead of resource for file controller actions #15754

Merged
merged 1 commit into from Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/api/app/controllers/webui/packages/files_controller.rb
Expand Up @@ -3,6 +3,7 @@
class FilesController < Packages::MainController
before_action :set_project
before_action :set_package
before_action :set_filename, only: :update
after_action :verify_authorized

def new
Expand Down Expand Up @@ -55,7 +56,7 @@
errors = []

begin
@package.save_file(file: params[:file], filename: params[:filename],
@package.save_file(file: params[:file], filename: @filename,
comment: params[:comment])
rescue APIError, StandardError => e
errors << e.message
Expand All @@ -64,15 +65,21 @@
end

if errors.blank?
flash.now[:success] = "'#{params[:filename]}' has been successfully saved."
flash.now[:success] = "'#{@filename}' has been successfully saved."
else
flash.now[:error] = "Error while adding '#{params[:filename]}': #{errors.compact.join("\n")}."
flash.now[:error] = "Error while adding '#{@filename}': #{errors.compact.join("\n")}."

Check warning on line 70 in src/api/app/controllers/webui/packages/files_controller.rb

View check run for this annotation

Codecov / codecov/patch

src/api/app/controllers/webui/packages/files_controller.rb#L70

Added line #L70 was not covered by tests
status = 400
end

status ||= 200
render layout: false, status: status, partial: 'layouts/webui/flash', object: flash
end

private

def set_filename
@filename = params[:filename]
end
danidoni marked this conversation as resolved.
Show resolved Hide resolved
end
end
end
2 changes: 1 addition & 1 deletion src/api/app/views/webui/package/_files_view.html.haml
Expand Up @@ -26,7 +26,7 @@
%i.fas.fa-hard-drive.text-primary
Add local files
.nav-item
= link_to(new_project_package_files_path(project, package), class: 'nav-link') do
= link_to(new_project_package_file_path(project, package), class: 'nav-link') do
%i.fas.fa-plus-circle.text-primary
Add an empty file or service
= render DeleteConfirmationDialogComponent.new(modal_id: 'delete-file-modal',
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/webui/package/view_file.html.haml
Expand Up @@ -24,7 +24,7 @@

-# TODO: Provide a comments field through a callback
= render(partial: 'webui/shared/editor', locals: { text: @file, mode: guess_code_class(@filename),
save: { url: project_package_files_path(@project, @package), method: :put,
save: { url: project_package_file_path(@project, @package, @filename), method: :put,
data: { project: @project.name, package: @package.name, submit: 'file', comment: '', filename: @filename, rev: @rev } } })
- else
= render(partial: 'webui/shared/editor', locals: { text: @file, mode: guess_code_class(@filename), style: { read_only: true } })
2 changes: 1 addition & 1 deletion src/api/config/routes/webui_routes.rb
Expand Up @@ -283,7 +283,7 @@
resources :deletions, controller: 'webui/requests/deletions', only: %i[new create], constraints: cons
resources :devel_project_changes, controller: 'webui/requests/devel_project_changes', only: %i[new create], constraints: cons
resources :submissions, controller: 'webui/requests/submissions', only: %i[new create], constraints: cons
resource :files, controller: 'webui/packages/files', only: %i[new create update], constraints: cons
resources :files, controller: 'webui/packages/files', only: %i[new create update], constraints: cons, param: :filename, format: false
put 'toggle_watched_item', controller: 'webui/watched_items', constraints: cons
resource :badge, controller: 'webui/packages/badge', only: [:show], constraints: cons.merge(format: :svg)
resources :repositories, only: [], param: :name do
Expand Down