mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-02-28 01:53:25 +00:00
Replace render text with render plain for rails 5.1
This commit is contained in:
@@ -14,7 +14,7 @@ module Admin
|
||||
@enterprise_relationship = EnterpriseRelationship.new enterprise_relationship_params
|
||||
|
||||
if @enterprise_relationship.save
|
||||
render text: Api::Admin::EnterpriseRelationshipSerializer.new(@enterprise_relationship).to_json
|
||||
render plain: Api::Admin::EnterpriseRelationshipSerializer.new(@enterprise_relationship).to_json
|
||||
else
|
||||
render status: :bad_request, json: { errors: @enterprise_relationship.errors.full_messages.join(', ') }
|
||||
end
|
||||
|
||||
@@ -10,7 +10,7 @@ module Admin
|
||||
@enterprise_role = EnterpriseRole.new enterprise_role_params
|
||||
|
||||
if @enterprise_role.save
|
||||
render text: Api::Admin::EnterpriseRoleSerializer.new(@enterprise_role).to_json
|
||||
render plain: Api::Admin::EnterpriseRoleSerializer.new(@enterprise_role).to_json
|
||||
|
||||
else
|
||||
render status: :bad_request, json: { errors: @enterprise_role.errors.full_messages.join(', ') }
|
||||
|
||||
@@ -62,7 +62,7 @@ module Admin
|
||||
end
|
||||
|
||||
respond_to do |format|
|
||||
format.js { render text: 'Ok' }
|
||||
format.js { render plain: 'Ok' }
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -6,9 +6,9 @@ module Api
|
||||
authorize! :destroy, enterprise_fee
|
||||
|
||||
if enterprise_fee.destroy
|
||||
render text: I18n.t(:successfully_removed), status: :no_content
|
||||
render plain: I18n.t(:successfully_removed), status: :no_content
|
||||
else
|
||||
render text: enterprise_fee.errors.full_messages.first, status: :forbidden
|
||||
render plain: enterprise_fee.errors.full_messages.first, status: :forbidden
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -37,9 +37,9 @@ module Api
|
||||
authorize! :update, @enterprise
|
||||
|
||||
if params[:logo] && @enterprise.update( logo: params[:logo] )
|
||||
render text: @enterprise.logo.url(:medium), status: :ok
|
||||
render plain: @enterprise.logo.url(:medium), status: :ok
|
||||
elsif params[:promo] && @enterprise.update( promo_image: params[:promo] )
|
||||
render text: @enterprise.promo_image.url(:medium), status: :ok
|
||||
render plain: @enterprise.promo_image.url(:medium), status: :ok
|
||||
else
|
||||
invalid_resource!(@enterprise)
|
||||
end
|
||||
|
||||
@@ -32,7 +32,7 @@ module Api
|
||||
private
|
||||
|
||||
def render_variant_count
|
||||
render text: {
|
||||
render plain: {
|
||||
count: variants.count
|
||||
}.to_json
|
||||
end
|
||||
|
||||
@@ -8,7 +8,7 @@ module Api
|
||||
def show
|
||||
enterprise = Enterprise.find_by(id: params[:id])
|
||||
|
||||
render text: Api::EnterpriseShopfrontSerializer.new(enterprise).to_json, status: :ok
|
||||
render plain: Api::EnterpriseShopfrontSerializer.new(enterprise).to_json, status: :ok
|
||||
end
|
||||
|
||||
def closed_shops
|
||||
|
||||
@@ -19,7 +19,7 @@ class DiscourseSsoController < ApplicationController
|
||||
begin
|
||||
redirect_to sso_url
|
||||
rescue TypeError
|
||||
render text: "Bad SingleSignOn request.", status: :bad_request
|
||||
render plain: "Bad SingleSignOn request.", status: :bad_request
|
||||
end
|
||||
else
|
||||
redirect_to login_path
|
||||
|
||||
@@ -39,14 +39,14 @@ class EnterprisesController < BaseController
|
||||
|
||||
def check_permalink
|
||||
if Enterprise.find_by permalink: params[:permalink]
|
||||
render(text: params[:permalink], status: :conflict) && return
|
||||
render(plain: params[:permalink], status: :conflict) && return
|
||||
end
|
||||
|
||||
begin
|
||||
Rails.application.routes.recognize_path( "/#{params[:permalink]}" )
|
||||
render text: params[:permalink], status: :conflict
|
||||
render plain: params[:permalink], status: :conflict
|
||||
rescue ActionController::RoutingError
|
||||
render text: params[:permalink], status: :ok
|
||||
render plain: params[:permalink], status: :ok
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ module Stripe
|
||||
end
|
||||
redirect_to main_app.edit_admin_enterprise_path(connector.enterprise, anchor: 'payment_methods')
|
||||
rescue Stripe::StripeError => e
|
||||
render text: e.message, status: :internal_server_error
|
||||
render plain: e.message, status: :internal_server_error
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -8,7 +8,7 @@ describe Api::BaseController do
|
||||
skip_authorization_check only: :index
|
||||
|
||||
def index
|
||||
render text: { "products" => [] }.to_json
|
||||
render plain: { "products" => [] }.to_json
|
||||
end
|
||||
|
||||
def spree_current_user; end
|
||||
|
||||
@@ -7,7 +7,7 @@ describe BaseController, type: :controller do
|
||||
let(:order) { instance_double(Spree::Order) }
|
||||
controller(BaseController) do
|
||||
def index
|
||||
render text: ""
|
||||
render plain: ""
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ describe Spree::Admin::BaseController, type: :controller do
|
||||
controller(Spree::Admin::BaseController) do
|
||||
def index
|
||||
before_filter :unauthorized
|
||||
render text: ""
|
||||
render plain: ""
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user