caboose-cms 0.5.232 → 0.5.233

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDZlYTJiYTgxMWY4NDk3MzM5NGI1ZjliNzVlNzIwOTE2ZDNkZTg3YQ==
+    YTgyMzMwMTYyOGYxYmNiN2JkNGEyYzhiNDNmYTgxMzMyYjJkOWViZg==
   data.tar.gz: !binary |-
-    NGE3YmExYTRhMzQ3OWM5NTM2NWIyZjAyODBiMGRmNGJiZjQ1M2Y2MQ==
+    Y2I4MjU2ZjliMjgwM2E2MjliYzA2NTZlZTYwOWI4MDkzN2M2MWY4ZQ==
 SHA512:
   metadata.gz: !binary |-
-    MmNlZjNjNTQ4NDIxMGI1MWVhYTg1ZWM0NmZiYzJhZWIyZmMxMjk1MGEyNjc4
-    MWI3Mjk2MmEyNzhkZDU3MDE3MDhlOWJmNWRiZjhmZjMzZjE3NmIxYThhZjk4
-    NTQ3MDE3MWY3MDcyYTEyYzExYmYwODZlOWI3ZjBmZWEzNmQ3Yzk=
+    OWYxN2VjYzg0ZTc4YzBkYTlhOGY0YTM4ZmM2YTQ5OTYzNzczNGRlMzVjNWQ2
+    OTgzYWZhNzBmODEzNTFlMjk5Mzk5OTExMDRiNDNiYzgzZjllYjExYzc3ZjUx
+    YTdmYWUwZDAwNjUzODdmOGE3Yzc0ODU5MDU3ZDYxMDViOGE3OGE=
   data.tar.gz: !binary |-
-    ZWMzN2JkMTJiM2FhNTQwMzVmZTI5MTVkOWVlYWExNTM2MDJmMjk5NjRkNTEx
-    YmExNDBjZjNiNWJkNWI4NmFhMDE0MWRjNGJjMzk3Yjc5YmRlZTQwOWUzODEx
-    YTNmZWQ1M2FjMThmZDg2Mjc4YjY2M2MzYjM4NjFkOGE4Yjg1NjA=
+    OTMzNDNmY2VlM2Y1NzJiNTZjZmUyMzdlYjEyOGE5OWU3YTE0MzUwNjI0Mzdl
+    ZDM3M2UyMjlmYTkwNzc2ZWE2OTNlZGU4MmU3ZTI3MTU0NmE1MzEyYzIyMjAz
+    YjQ5NTlmMmFlMzc5M2MxZmU0MTdhNDFlYTcxM2UyMmI5ZGZiODA=

data/app/controllers/caboose/media_categories_controller.rb

@@ -16,6 +16,15 @@ module Caboose
       tree = Caboose::MediaCategory.flat_tree(@site.id, prefix)
       render :json => tree
     end
+    
+    # GET /admin/media-categories/options
+    def admin_options
+      return unless user_is_allowed('mediacategories', 'view')
+      prefix = params[:prefix] ? params[:prefix] : '-  '
+      tree = Caboose::MediaCategory.flat_tree(@site.id, prefix)
+      options = tree.collect{ |mc| { 'value' => mc.id, 'text' => mc.name }}
+      render :json => tree
+    end
 
     # POST /admin/media-categories
     def admin_add
@@ -86,7 +95,7 @@ module Caboose
       end
         
       render :json => { :success => true }
-    end
+    end        
         		
   end
 end

data/config/routes.rb

@@ -223,12 +223,13 @@ Caboose::Engine.routes.draw do
   delete  "/admin/media/:id"            => "media#admin_delete"
   
   
-  get     "/admin/media-categories/json"        => "media_categories#admin_json"
-  get     "/admin/media-categories/flat-tree"   => "media_categories#admin_flat_tree"
-  post    "/admin/media-categories"             => "media_categories#admin_add"
-  post    "/admin/media-categories/:id/attach"  => "media_categories#admin_attach"
-  put     "/admin/media-categories/:id"         => "media_categories#admin_update"      
-  delete  "/admin/media-categories/:id"         => "media_categories#admin_delete"
+  get     "/admin/media-categories/json"       => "media_categories#admin_json"
+  get     "/admin/media-categories/options"    => "media_categories#admin_options"
+  get     "/admin/media-categories/flat-tree"  => "media_categories#admin_flat_tree"
+  post    "/admin/media-categories"            => "media_categories#admin_add"
+  post    "/admin/media-categories/:id/attach" => "media_categories#admin_attach"
+  put     "/admin/media-categories/:id"        => "media_categories#admin_update"      
+  delete  "/admin/media-categories/:id"        => "media_categories#admin_delete"
   
   #=============================================================================
   # Settings

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.232'
+  VERSION = '0.5.233'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.232
+  version: 0.5.233
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg