From 7f729bd402f801696a0bdc57a5d73e8644e5cac0 Mon Sep 17 00:00:00 2001 From: Michael Bianco Date: Wed, 28 Mar 2012 21:51:16 -0400 Subject: [PATCH] Forgot to save merged changed. Minor deface fix --- ...d_digital_versions_to_admin_product_tabs.rb | 2 +- lib/spree_digital.rb | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/app/overrides/add_digital_versions_to_admin_product_tabs.rb b/app/overrides/add_digital_versions_to_admin_product_tabs.rb index acb2f7f..08ac92b 100644 --- a/app/overrides/add_digital_versions_to_admin_product_tabs.rb +++ b/app/overrides/add_digital_versions_to_admin_product_tabs.rb @@ -1,4 +1,4 @@ -Deface::Override.new(:virtual_path => "admin/shared/_product_tabs", +Deface::Override.new(:virtual_path => "spree/admin/shared/_product_tabs", :name => "add_digital_versions_to_admin_product_tabs", :insert_bottom => "[data-hook='admin_product_tabs'], #admin_product_tabs[data-hook]", :text => " > diff --git a/lib/spree_digital.rb b/lib/spree_digital.rb index cbbc7d4..0ee9772 100644 --- a/lib/spree_digital.rb +++ b/lib/spree_digital.rb @@ -1,20 +1,2 @@ require 'spree_core' -<<<<<<< HEAD - -module SpreeDigital - class Engine < Rails::Engine - - config.autoload_paths += %W(#{config.root}/lib) - - def self.activate - Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c| - Rails.env.production? ? require(c) : load(c) - end - end - - config.to_prepare &method(:activate).to_proc - end -end -======= require 'spree_digital/engine' ->>>>>>> 9b919de... Modified to fit spree 0.70 extension