caboose-cms 0.4.150 → 0.4.151

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +8 -8
  2. data/app/assets/javascripts/caboose/model/#Untitled-1# +2 -0
  3. data/app/views/caboose/blocks/admin_new.html.erb +5 -1
  4. data/lib/caboose/version.rb +1 -1
  5. metadata +2 -1
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- ZGZlMDM5NDZkZTI0NjBkZmQyN2JkMmM0M2M5Mzc1YjQ0MzMxOGNjOA==
4
+ YzY1NmViNjUxMTY5MWU3MmQ2Y2Y0Y2EyNjIwYWI3NmJlZTFlZTIwOA==
5
5
  data.tar.gz: !binary |-
6
- M2QzNWNlYmY2YWJiZjY2OWNkMGU2YTc3M2FjMjg4OTczMDQxMjBmZg==
6
+ NzRkZGIwZGRiZjBiOGVhZDJmMDk5MGIxNjg2MmI0MmEzMmJhZGMzYQ==
7
7
  !binary "U0hBNTEy":
8
8
  metadata.gz: !binary |-
9
- Y2EzYWExMDU3MzY4MjA4ZjdlZmIxYWU2MzY4ZTk5YmQyMDJjZTYyYWExYTA4
10
- NTM5ODk1MDgzNjA0OGRkNjg3ZDMxY2Q0NTFkMTdmMDkzZGNiNzY1OTM1Yzc0
11
- MzYxZTY2YTJlMjQ2Nzc4OWUwNjM4YTZkM2JkYWU2YTIzMDhhYTk=
9
+ OTY3ZTgzY2JlNzdlMjlmZDJmMWQwYzA0NDVhYzAyZmI0NWIyNzA4MmNjOWFm
10
+ MTM5MjZmZDZlMjhjNzFhYjIyZDJmYWY5ZGY1NDU1YjUzODdjOGYyOGM0NTli
11
+ OGFkNTdjNmMzYmQzODc1NTEzZjU3OTY2ZjE3NDFiMzEyNWFhNTM=
12
12
  data.tar.gz: !binary |-
13
- MmNiMzg1ZTIzMTkzZGE3ZTE1Y2E4NzRiYzg5MWUxYmU1NGQ0MmY2NjFkYWI5
14
- OTI2YWUyZjdkOGYyOWNhMmIxYzFkMzk2YTdlMDk5MjdiODQyNDQ3NTQwMzcy
15
- MDQ2ZWI3NTQ2MThmM2QwMzU3OWRiYmQ2MjJkZjYyZDI3ZjIxOWQ=
13
+ NzBiMGJmYzRiOWJhZjQ0ODA4YTZhOGNkOGU5NGQwMTY0MDZlMWIyOGQxY2Iw
14
+ MDFkZDYxOTg4YjM2NDM5MmQ1NmJjN2JkMWYxOWU0NjEzOTEwN2FkNWM3MDJj
15
+ OTdlNDJhOTFkNDA5NGYxN2M2NmM3MTlkOTQ3MjM0ZjIwNTRhYmU=
data/app/assets/javascripts/caboose/model/#Untitled-1# ADDED
@@ -0,0 +1,2 @@
1
+
2
+ select id from block_types where parent_id is null
data/app/views/caboose/blocks/admin_new.html.erb CHANGED
@@ -24,7 +24,11 @@ b = @block
24
24
  <div class='icons'>
25
25
  <% Caboose::BlockTypeCategory.reorder(:name).all.each do |cat| %>
26
26
  <% next if cat.parent_id.nil? && cat.name == 'Layouts' %>
27
- <% kids = cat.block_types.where("parent_id is null and (site_id is null or site_id = ?)", @site.id).reorder(:name).all %>
27
+ <%
28
+ #kids = cat.block_types.where("parent_id is null and (site_id is null or site_id = ?)", @site.id).reorder(:name).all
29
+ arr = ["parent_id is null and block_type_category_id = ? and block_type_site_memberships.site_id = ?", cat.id, @site.id]
30
+ kids = Caboose::BlockType.includes(:block_type_site_memberships).where(arr).reorder(:name).all
31
+ %>
28
32
  <% if kids && kids.count > 0 %>
29
33
  <h2 onclick="$('#cat<%= cat.id %>_container').slideToggle();"><%= cat.name %></h3>
30
34
  <div id='cat<%= cat.id %>_container'>
data/lib/caboose/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Caboose
2
- VERSION = '0.4.150'
2
+ VERSION = '0.4.151'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: caboose-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.150
4
+ version: 0.4.151
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry
@@ -207,6 +207,7 @@ files:
207
207
  - app/assets/javascripts/caboose/main.js
208
208
  - app/assets/javascripts/caboose/modal.js
209
209
  - app/assets/javascripts/caboose/modal_integration.js
210
+ - app/assets/javascripts/caboose/model/#Untitled-1#
210
211
  - app/assets/javascripts/caboose/model/all.js
211
212
  - app/assets/javascripts/caboose/model/attribute.js
212
213
  - app/assets/javascripts/caboose/model/bound_checkbox.js