diff --git a/README.md b/README.md index b4f538c..7f8ca37 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Spree Drop Ship will support several other Spree extensions being used by scopin Some extensions that can be used in conjunction with Spree Drop Ship: * spree_digital -* spree_editor +* spree_editor (assumes use of ckeditor & you should delete the generated models & initializer in your app to use spree_editors copies) * spree_group_pricing * spree_marketplace * spree_related_products diff --git a/app/models/ckeditor/asset_decorator.rb b/app/models/ckeditor/asset_decorator.rb index 41fa363..0595df1 100644 --- a/app/models/ckeditor/asset_decorator.rb +++ b/app/models/ckeditor/asset_decorator.rb @@ -1,4 +1,4 @@ -if defined?(Ckeditor::Asset) +if defined?(Ckeditor) Ckeditor::Asset.class_eval do belongs_to :supplier, class_name: 'Spree::Supplier' end diff --git a/app/models/spree/supplier_ability.rb b/app/models/spree/supplier_ability.rb index 2d6449e..4c38ac4 100644 --- a/app/models/spree/supplier_ability.rb +++ b/app/models/spree/supplier_ability.rb @@ -41,7 +41,7 @@ def initialize(user) can :create, Spree::Supplier end - if defined?(Ckeditor::AttachmentFile) && defined?(Ckeditor::Picture) + if defined?(Ckeditor) can :access, :ckeditor can :create, Ckeditor::AttachmentFile