caboose-cms 0.4.150 → 0.4.151

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGZlMDM5NDZkZTI0NjBkZmQyN2JkMmM0M2M5Mzc1YjQ0MzMxOGNjOA==
+    YzY1NmViNjUxMTY5MWU3MmQ2Y2Y0Y2EyNjIwYWI3NmJlZTFlZTIwOA==
   data.tar.gz: !binary |-
-    M2QzNWNlYmY2YWJiZjY2OWNkMGU2YTc3M2FjMjg4OTczMDQxMjBmZg==
+    NzRkZGIwZGRiZjBiOGVhZDJmMDk5MGIxNjg2MmI0MmEzMmJhZGMzYQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2EzYWExMDU3MzY4MjA4ZjdlZmIxYWU2MzY4ZTk5YmQyMDJjZTYyYWExYTA4
-    NTM5ODk1MDgzNjA0OGRkNjg3ZDMxY2Q0NTFkMTdmMDkzZGNiNzY1OTM1Yzc0
-    MzYxZTY2YTJlMjQ2Nzc4OWUwNjM4YTZkM2JkYWU2YTIzMDhhYTk=
+    OTY3ZTgzY2JlNzdlMjlmZDJmMWQwYzA0NDVhYzAyZmI0NWIyNzA4MmNjOWFm
+    MTM5MjZmZDZlMjhjNzFhYjIyZDJmYWY5ZGY1NDU1YjUzODdjOGYyOGM0NTli
+    OGFkNTdjNmMzYmQzODc1NTEzZjU3OTY2ZjE3NDFiMzEyNWFhNTM=
   data.tar.gz: !binary |-
-    MmNiMzg1ZTIzMTkzZGE3ZTE1Y2E4NzRiYzg5MWUxYmU1NGQ0MmY2NjFkYWI5
-    OTI2YWUyZjdkOGYyOWNhMmIxYzFkMzk2YTdlMDk5MjdiODQyNDQ3NTQwMzcy
-    MDQ2ZWI3NTQ2MThmM2QwMzU3OWRiYmQ2MjJkZjYyZDI3ZjIxOWQ=
+    NzBiMGJmYzRiOWJhZjQ0ODA4YTZhOGNkOGU5NGQwMTY0MDZlMWIyOGQxY2Iw
+    MDFkZDYxOTg4YjM2NDM5MmQ1NmJjN2JkMWYxOWU0NjEzOTEwN2FkNWM3MDJj
+    OTdlNDJhOTFkNDA5NGYxN2M2NmM3MTlkOTQ3MjM0ZjIwNTRhYmU=

data/app/assets/javascripts/caboose/model/#Untitled-1#

@@ -0,0 +1,2 @@
+
+  select id from block_types where parent_id is null

data/app/views/caboose/blocks/admin_new.html.erb

@@ -24,7 +24,11 @@ b = @block
 <div class='icons'>
   <% Caboose::BlockTypeCategory.reorder(:name).all.each do |cat| %>
     <% next if cat.parent_id.nil? && cat.name == 'Layouts' %>
-    <% kids = cat.block_types.where("parent_id is null and (site_id is null or site_id = ?)", @site.id).reorder(:name).all %>
+    <%
+    #kids = cat.block_types.where("parent_id is null and (site_id is null or site_id = ?)", @site.id).reorder(:name).all
+    arr = ["parent_id is null and block_type_category_id = ? and block_type_site_memberships.site_id = ?", cat.id, @site.id]     
+    kids = Caboose::BlockType.includes(:block_type_site_memberships).where(arr).reorder(:name).all
+    %>
     <% if kids && kids.count > 0 %>
       <h2 onclick="$('#cat<%= cat.id %>_container').slideToggle();"><%= cat.name %></h3>
       <div id='cat<%= cat.id %>_container'>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.150'
+  VERSION = '0.4.151'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.150
+  version: 0.4.151
 platform: ruby
 authors:
 - William Barry
@@ -207,6 +207,7 @@ files:
 - app/assets/javascripts/caboose/main.js
 - app/assets/javascripts/caboose/modal.js
 - app/assets/javascripts/caboose/modal_integration.js
+- app/assets/javascripts/caboose/model/#Untitled-1#
 - app/assets/javascripts/caboose/model/all.js
 - app/assets/javascripts/caboose/model/attribute.js
 - app/assets/javascripts/caboose/model/bound_checkbox.js