ecm_products 2.0.6.pre → 2.0.8.pre

data/app/controllers/ecm/products/products_controller.rb

@@ -1,6 +1,10 @@
 class Ecm::Products::ProductsController < ApplicationController
   def index
-    @products = ::Ecm::Products::Product.all
+    if params[:ecm_products_product_category_id]
+      @products = ::Ecm::Products::ProductCategory.find(params[:ecm_products_product_category_id]).ecm_products_products
+    else
+      @products = ::Ecm::Products::Product.all
+    end
   end
   
   def show

data/lib/ecm/products/active_admin/ecm_products_product_links.rb

@@ -1,3 +1,5 @@
+include ActiveAdmin::ActsAsList::Helper if defined?(ActiveAdmin)
+
 ::ActiveAdmin.register Ecm::Products::ProductLink do
   # menu entry settings
   menu :parent => Proc.new { I18n.t('ecm.products.active_admin.menu') }.call

data/lib/ecm/products/active_admin/ecm_products_products.rb

@@ -38,7 +38,7 @@ include ActiveAdmin::ActsAsList::Helper if defined?(ActiveAdmin)
 #        end
 
 #        pp.inputs do
-          pp.input :markup_language, :as => :select, :collection => Ecm::Products::ProductPicture::MARKUP_LANGUAGES
+          pp.input :markup_language, :as => :select, :collection => Ecm::Products::Configuration.markup_languages
 #        end
       end # f.has_many
     end

data/lib/ecm/products/version.rb

@@ -1,5 +1,5 @@
 module ECM
   module Products
-    VERSION = "2.0.6.pre"
+    VERSION = "2.0.8.pre"
   end  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ecm_products
 version: !ruby/object:Gem::Version 
-  hash: 961916028
+  hash: 961915972
   prerelease: 6
   segments: 
   - 2
   - 0
-  - 6
+  - 8
   - pre
-  version: 2.0.6.pre
+  version: 2.0.8.pre
 platform: ruby
 authors: 
 - Roberto Vasquez Angel
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-26 00:00:00 Z
+date: 2012-10-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails