diff --git a/app/controllers/admin/poll/active_polls_controller.rb b/app/controllers/admin/poll/active_polls_controller.rb index 17690a803..5dbc5cff7 100644 --- a/app/controllers/admin/poll/active_polls_controller.rb +++ b/app/controllers/admin/poll/active_polls_controller.rb @@ -5,7 +5,7 @@ class Admin::Poll::ActivePollsController < Admin::Poll::BaseController def create if @active_poll.update(active_poll_params) - redirect_to admin_polls_url, notice: t("flash.actions.update.active_poll") + redirect_to admin_polls_path, notice: t("flash.actions.update.active_poll") else render :edit end @@ -16,7 +16,7 @@ class Admin::Poll::ActivePollsController < Admin::Poll::BaseController def update if @active_poll.update(active_poll_params) - redirect_to admin_polls_url, notice: t("flash.actions.update.active_poll") + redirect_to admin_polls_path, notice: t("flash.actions.update.active_poll") else render :edit end diff --git a/app/controllers/admin/widget/cards_controller.rb b/app/controllers/admin/widget/cards_controller.rb index eb1e6ba79..514df854e 100644 --- a/app/controllers/admin/widget/cards_controller.rb +++ b/app/controllers/admin/widget/cards_controller.rb @@ -60,7 +60,7 @@ class Admin::Widget::CardsController < Admin::BaseController if @card.site_customization_page_id redirect_to admin_site_customization_page_cards_path(page), notice: notice else - redirect_to admin_homepage_url, notice: notice + redirect_to admin_homepage_path, notice: notice end end diff --git a/app/controllers/concerns/access_denied_handler.rb b/app/controllers/concerns/access_denied_handler.rb index d924baf56..080a77283 100644 --- a/app/controllers/concerns/access_denied_handler.rb +++ b/app/controllers/concerns/access_denied_handler.rb @@ -4,7 +4,7 @@ module AccessDeniedHandler included do rescue_from CanCan::AccessDenied do |exception| respond_to do |format| - format.html { redirect_to main_app.root_url, alert: exception.message } + format.html { redirect_to main_app.root_path, alert: exception.message } format.json { render json: { error: exception.message }, status: :forbidden } end end diff --git a/app/controllers/management/users_controller.rb b/app/controllers/management/users_controller.rb index 7a063e82e..93cb6f9bd 100644 --- a/app/controllers/management/users_controller.rb +++ b/app/controllers/management/users_controller.rb @@ -32,7 +32,7 @@ class Management::UsersController < Management::BaseController def logout destroy_session - redirect_to management_root_url, notice: t("management.sessions.signed_out_managed_user") + redirect_to management_root_path, notice: t("management.sessions.signed_out_managed_user") end private diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb index 67edc4e26..ccd3f8e1a 100644 --- a/app/controllers/users/omniauth_callbacks_controller.rb +++ b/app/controllers/users/omniauth_callbacks_controller.rb @@ -36,7 +36,7 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController set_flash_message(:notice, :success, kind: provider.to_s.capitalize) if is_navigational_format? else session["devise.#{provider}_data"] = auth - redirect_to new_user_registration_url + redirect_to new_user_registration_path end end diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb index cb5e256af..56211a65f 100644 --- a/app/controllers/users/registrations_controller.rb +++ b/app/controllers/users/registrations_controller.rb @@ -26,7 +26,7 @@ class Users::RegistrationsController < Devise::RegistrationsController def delete current_user.erase(erase_params[:erase_reason]) sign_out - redirect_to root_url, notice: t("devise.registrations.destroyed") + redirect_to root_path, notice: t("devise.registrations.destroyed") end def success diff --git a/app/helpers/direct_uploads_helper.rb b/app/helpers/direct_uploads_helper.rb index d697b5127..54a6c958b 100644 --- a/app/helpers/direct_uploads_helper.rb +++ b/app/helpers/direct_uploads_helper.rb @@ -3,11 +3,13 @@ module DirectUploadsHelper def render_destroy_upload_link(direct_upload) label = direct_upload.resource_relation == "image" ? "images" : "documents" link_to t("#{label}.form.delete_button"), - direct_upload_destroy_url("direct_upload[resource_type]": direct_upload.resource_type, - "direct_upload[resource_id]": direct_upload.resource_id, - "direct_upload[resource_relation]": direct_upload.resource_relation, - "direct_upload[cached_attachment]": direct_upload.relation.cached_attachment, - format: :json), + direct_upload_destroy_path( + "direct_upload[resource_type]": direct_upload.resource_type, + "direct_upload[resource_id]": direct_upload.resource_id, + "direct_upload[resource_relation]": direct_upload.resource_relation, + "direct_upload[cached_attachment]": direct_upload.relation.cached_attachment, + format: :json + ), method: :delete, remote: true, class: "delete remove-cached-attachment" diff --git a/app/helpers/documents_helper.rb b/app/helpers/documents_helper.rb index 1386796bb..eeb517f46 100644 --- a/app/helpers/documents_helper.rb +++ b/app/helpers/documents_helper.rb @@ -19,13 +19,15 @@ module DocumentsHelper def render_destroy_document_link(builder, document) if !document.persisted? && document.cached_attachment.present? link_to t("documents.form.delete_button"), - direct_upload_destroy_url("direct_upload[resource_type]": document.documentable_type, - "direct_upload[resource_id]": document.documentable_id, - "direct_upload[resource_relation]": "documents", - "direct_upload[cached_attachment]": document.cached_attachment), - method: :delete, - remote: true, - class: "delete remove-cached-attachment" + direct_upload_destroy_path( + "direct_upload[resource_type]": document.documentable_type, + "direct_upload[resource_id]": document.documentable_id, + "direct_upload[resource_relation]": "documents", + "direct_upload[cached_attachment]": document.cached_attachment + ), + method: :delete, + remote: true, + class: "delete remove-cached-attachment" else link_to_remove_association document.new_record? ? t("documents.form.cancel_button") : t("documents.form.delete_button"), builder, class: "delete remove-document" end @@ -38,15 +40,15 @@ module DocumentsHelper accept: accepted_content_types_extensions(document.documentable_type.constantize), class: "js-document-attachment", data: { - url: document_direct_upload_url(document), + url: document_direct_upload_path(document), nested_document: true } end - def document_direct_upload_url(document) - direct_uploads_url("direct_upload[resource_type]": document.documentable_type, - "direct_upload[resource_id]": document.documentable_id, - "direct_upload[resource_relation]": "documents") + def document_direct_upload_path(document) + direct_uploads_path("direct_upload[resource_type]": document.documentable_type, + "direct_upload[resource_id]": document.documentable_id, + "direct_upload[resource_relation]": "documents") end def document_item_link(document) diff --git a/app/helpers/images_helper.rb b/app/helpers/images_helper.rb index 632634aee..4d5b620f2 100644 --- a/app/helpers/images_helper.rb +++ b/app/helpers/images_helper.rb @@ -28,10 +28,12 @@ module ImagesHelper def render_destroy_image_link(builder, image) if !image.persisted? && image.cached_attachment.present? link_to t("images.form.delete_button"), - direct_upload_destroy_url("direct_upload[resource_type]": image.imageable_type, - "direct_upload[resource_id]": image.imageable_id, - "direct_upload[resource_relation]": "image", - "direct_upload[cached_attachment]": image.cached_attachment), + direct_upload_destroy_path( + "direct_upload[resource_type]": image.imageable_type, + "direct_upload[resource_id]": image.imageable_id, + "direct_upload[resource_relation]": "image", + "direct_upload[cached_attachment]": image.cached_attachment + ), method: :delete, remote: true, class: "delete remove-cached-attachment" @@ -47,7 +49,7 @@ module ImagesHelper accept: imageable_accepted_content_types_extensions, class: "js-image-attachment", data: { - url: image_direct_upload_url(imageable), + url: image_direct_upload_path(imageable), nested_image: true } end @@ -59,10 +61,10 @@ module ImagesHelper show_caption: show_caption end - def image_direct_upload_url(imageable) - direct_uploads_url("direct_upload[resource_type]": imageable.class.name, - "direct_upload[resource_id]": imageable.id, - "direct_upload[resource_relation]": "image") + def image_direct_upload_path(imageable) + direct_uploads_path("direct_upload[resource_type]": imageable.class.name, + "direct_upload[resource_id]": imageable.id, + "direct_upload[resource_relation]": "image") end end diff --git a/app/views/admin/poll/active_polls/edit.html.erb b/app/views/admin/poll/active_polls/edit.html.erb index 6d8b39c67..a4cebcdcd 100644 --- a/app/views/admin/poll/active_polls/edit.html.erb +++ b/app/views/admin/poll/active_polls/edit.html.erb @@ -3,5 +3,5 @@

<%= t("admin.active_polls.edit.title") %>

- <%= render "form", form_url: admin_active_polls_url(@active_poll) %> + <%= render "form", form_url: admin_active_polls_path(@active_poll) %>
diff --git a/app/views/budgets/ballot/_investment_for_sidebar.html.erb b/app/views/budgets/ballot/_investment_for_sidebar.html.erb index 82db87e87..a0c268a35 100644 --- a/app/views/budgets/ballot/_investment_for_sidebar.html.erb +++ b/app/views/budgets/ballot/_investment_for_sidebar.html.erb @@ -3,8 +3,8 @@ <%= investment.formatted_price %> <% if @budget.balloting? %> - <%= link_to budget_ballot_line_url(id: investment.id, - investments_ids: investment_ids), + <%= link_to budget_ballot_line_path(id: investment.id, + investments_ids: investment_ids), title: t("budgets.ballots.show.remove"), class: "remove-investment-project", method: :delete, diff --git a/app/views/budgets/investments/_ballot.html.erb b/app/views/budgets/investments/_ballot.html.erb index 73fe2fe8b..fb712b423 100644 --- a/app/views/budgets/investments/_ballot.html.erb +++ b/app/views/budgets/investments/_ballot.html.erb @@ -28,9 +28,9 @@

<% if investment.should_show_ballots? %> <%= link_to t("budgets.investments.investment.add"), - budget_ballot_lines_url(investment_id: investment.id, - budget_id: investment.budget_id, - investments_ids: investment_ids), + budget_ballot_lines_path(investment_id: investment.id, + budget_id: investment.budget_id, + investments_ids: investment_ids), class: "button button-support small expanded", title: t("budgets.investments.investment.support_title"), method: :post, diff --git a/app/views/budgets/investments/index.html.erb b/app/views/budgets/investments/index.html.erb index d167cf53a..023fa1579 100644 --- a/app/views/budgets/investments/index.html.erb +++ b/app/views/budgets/investments/index.html.erb @@ -55,7 +55,7 @@ <% end %> - <%= render("shared/advanced_search", search_path: budget_investments_url(@budget)) %> + <%= render("shared/advanced_search", search_path: budget_investments_path(@budget)) %> <% if unfeasible_or_unselected_filter %>