Merge pull request #4841 from luisramos0/kill_rabl

Hide broken product taxons field, remove last rabl template and rabl itself
This commit is contained in:
Luis Ramos
2020-04-21 18:49:12 +01:00
committed by GitHub
8 changed files with 1 additions and 29 deletions

View File

@@ -853,7 +853,6 @@ Style/FrozenStringLiteralComment:
- 'app/validators/date_time_string_validator.rb'
- 'app/validators/distributors_validator.rb'
- 'app/validators/integer_array_validator.rb'
- 'app/views/spree/admin/taxons/search.rabl'
- 'config.ru'
- 'engines/order_management/app/controllers/order_management/application_controller.rb'
- 'engines/order_management/app/services/order_management/reports/enterprise_fee_summary/authorizer.rb'

View File

@@ -55,7 +55,6 @@ gem 'aws-sdk'
gem 'bugsnag'
gem 'db2fog'
gem 'haml'
gem 'rabl'
gem 'redcarpet'
gem 'sass', "~> 3.3"
gem 'sass-rails', '~> 3.2.3'

View File

@@ -502,8 +502,6 @@ GEM
byebug (>= 9.0, < 9.1)
pry (~> 0.10)
public_suffix (4.0.3)
rabl (0.8.4)
activesupport (>= 2.3.14)
rack (1.4.7)
rack-cache (1.11.0)
rack (>= 0.4)
@@ -754,7 +752,6 @@ DEPENDENCIES
paperclip (~> 3.4.1)
pg (~> 0.21.0)
pry-byebug (>= 3.4.3)
rabl
rack-mini-profiler (< 3.0.0)
rack-rewrite
rack-ssl

View File

@@ -1,6 +1,6 @@
Darkswarm.factory 'OrderCycle', ($resource, orderCycleData) ->
class OrderCycle
@order_cycle = orderCycleData # Object or {} due to RABL
@order_cycle = orderCycleData # Object or {}
@push_order_cycle: (callback) ->
new $resource("/shop/order_cycle").save {order_cycle_id: @order_cycle.order_cycle_id}, (order_data)->
OrderCycle.order_cycle.orders_close_at = order_data.orders_close_at

View File

@@ -3,14 +3,6 @@ module Spree
class TaxonsController < Spree::Admin::BaseController
respond_to :html, :json, :js
def search
@taxons = if params[:ids]
Spree::Taxon.where(id: params[:ids].split(','))
else
Spree::Taxon.limit(20).search(name_cont: params[:q]).result
end
end
def create
@taxonomy = Taxonomy.find(params[:taxonomy_id])
@taxon = @taxonomy.taxons.build(params[:taxon])

View File

@@ -16,11 +16,6 @@
= sanitize(@product.description)
= f.error_message_on :description
= f.field_container :taxons do
= f.label :taxon_ids, t(:taxons)
%br
= f.hidden_field :taxon_ids, :value => @product.taxon_ids.join(',')
.right.four.columns.omega
.variant_units_form{ 'ng-app' => 'admin.products', 'ng-controller' => 'editUnitsCtrl' }

View File

@@ -1,4 +0,0 @@
object false
child(@taxons => :taxons) do
attributes :name, :pretty_name, :id
end

View File

@@ -154,12 +154,6 @@ Spree::Core::Engine.routes.draw do
resources :taxons
end
resources :taxons, :only => [] do
collection do
get :search
end
end
resources :tax_rates
resource :tax_settings
resources :tax_categories