Merge branch 'development' of https://github.com/Rulingcom/orbit into development

app/models/category.rb

@@ -13,25 +13,4 @@ class Category
 
   scope :enabled, where(:disable.in => [false, nil, ''])
 
-end
-
-
-
-      # base.instance_eval("scope :admin_manager_all,find(:all)")
-      
-      # base.define_singleton_method :find do |*args|
-      #   if args ==[:all]
-      #     unscoped
-      #   else
-      #     res = unscoped.find(args) 
-      #     res.count == 1 ? res[0] : res
-      #   end
-      # end
-
-      # base.define_singleton_method :first do |*args|
-      #   all.first
-      # end
-
-      # base.define_singleton_method :last do |*args|
-      #   all.last
-      # end
+end

app/models/module_app.rb

@@ -22,7 +22,9 @@ class ModuleApp
     self[:widgets] = reg.get_widgets
     self[:has_tag] = reg.get_has_tags
     self[:has_category] = reg.get_has_category
+    self[:is_approvable] = reg.get_is_approvable
     self[:is_authorizable] = reg.get_is_authorizable
+    self[:authorizable_models] = reg.get_authorizable_models
   end