Skip to content

Commit

Permalink
Use resources instead of resource for file controller actions
Browse files Browse the repository at this point in the history
  • Loading branch information
hellcp-work committed Mar 8, 2024
1 parent 26580b3 commit c5a6c84
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 6 deletions.
13 changes: 10 additions & 3 deletions src/api/app/controllers/webui/packages/files_controller.rb
Expand Up @@ -3,6 +3,7 @@ module Packages
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 @@ def update
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 @@ def update
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
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: [:new, :create], constraints: cons
resources :devel_project_changes, controller: 'webui/requests/devel_project_changes', only: [:new, :create], constraints: cons
resources :submissions, controller: 'webui/requests/submissions', only: [:new, :create], constraints: cons
resource :files, controller: 'webui/packages/files', only: [:new, :create, :update], constraints: cons
resources :files, controller: 'webui/packages/files', only: [: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

0 comments on commit c5a6c84

Please sign in to comment.