caboose-cms 0.4.138 → 0.4.139

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTc5NzQ4N2E0YTVmZjM4NDllYjc0ZjA3NzczMTU5ZDZmM2FlNDJiYw==
+    YjBjMzNkMmZmODk2YWQxOWNmNDFjZTAzZjU3NTY3ZDk3ZDBjNjA5NA==
   data.tar.gz: !binary |-
-    NWViNWVjYmYxZGJjODE0YzQ0ZjEzYTliZmE4Y2YzZDdkMjBmNGYzYw==
+    MzYxNjM1NzYzMDgwM2QyNWE3YzYzZWYxMzUzNGU5YTc4ODBhYzg4MQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    N2RlZTk3M2FlZGIwYzY1MjYxM2RmZTZjYmI4NmQwMTZjNmI3OTk0MzBhZDVi
-    MDhhMGVmMThlNGQzNTFkNDE0OTI5ZjRmM2Y3M2U5MTI3NGI2ZmU5NDZlMzQ0
-    MzYzZDQ1ZmJiNjNkNmUxY2ZlZGI4NzlkZWRmN2NiZWIxMGY1NGI=
+    NGE5NmE5YThkOWY5ODkyOTY4Y2U2NWY1YjgxYjAwNTg5MDgyYTg4YjI4Yjc1
+    NzBiNDQyNTQ3NTQ2NGJjMjQ0OWU0MzkwMTY3OTU1YmM4ZDM4ODhjNzI2OWNk
+    NWIzZGVjNjMwNWFjMDI2YzhiMzE4NTE0MmZjODgzZjYzNTVlZTE=
   data.tar.gz: !binary |-
-    ODAzYzE4ZDllYzNlODY1MzNiY2VjNmQyNWI3YThjZjQ3NTgxNWI2OGViNDAy
-    NGNiZmIzZDM2MmUyMTI0YTY1NmIwNWFmZjY5YjYwOWU5YWRlMDQzNTBlY2Rk
-    YTAwNTVhYTBlMTM3MTU2MzI3ZDU1YTAyOGExZTFmMTZjZjNjYmY=
+    YzAzMmMxOTI5YmJlM2U3NGIwZmZlNjc3NWUwZTEwM2Y3ZWEzYWU3NGUyM2Jj
+    YmQzNWFjOWM4ZjE0NGZjMTQ1NTBmOGNlOGZjYjBjODc4ODIwZGFlNmM2NWQ2
+    M2RjY2M4Mjg1ODllMTE3ZWYzNzNhMDg5ZGQ3ODExODZlODg0ZDg=

data/app/assets/javascripts/caboose/model/bound_checkbox_multiple.js

@@ -27,7 +27,11 @@ BoundCheckboxMultiple = BoundControl.extend({
       div.css('height', '' + this.attribute.height + 'px').css('overflow-y', 'scroll');        
     $('#'+this.el).wrap(div);    
     $('#'+this.el+'_container').empty();        
-
+    if (this.attribute.value == null || this.attribute.value == false)
+      this.attribute.value = [];
+    if (typeof(this.attribute.value) == 'string')    
+      this.attribute.value = this.attribute.value.split('|');    
+    
     if (this.attribute.options_url)      
     {
       ModelBinder.wait_for_options(this.attribute.options_url, function(options) {
@@ -45,7 +49,7 @@ BoundCheckboxMultiple = BoundControl.extend({
     {      
       var all_checked = true
       $.each(this.attribute.options, function(i, option) {        
-        if (that.attribute.value.indexOf(option.value) == -1)
+        if (!that.attribute.value || that.attribute.value.indexOf(option.value) == -1)
         {
           all_checked = false;
           return;
@@ -71,7 +75,7 @@ BoundCheckboxMultiple = BoundControl.extend({
       );      
     }
     $.each(that.attribute.options, function(i, option) {
-      var checked = that.attribute.value.indexOf(option.value) > -1;
+      var checked = that.attribute.value != false && that.attribute.value != null && that.attribute.value.indexOf(option.value) > -1;
       tbody.append($('<tr/>')
         .append($('<td/>')
           .append($('<input/>')
@@ -96,7 +100,7 @@ BoundCheckboxMultiple = BoundControl.extend({
         .append($('<td/>').append($('<label/>').attr('for', that.el + '_' + i).html(option.text)))
       );
     });
-    $('#'+this.el+'_container').append($('<table/>').addClass('data').append(tbody));    
+    $('#'+this.el+'_container').append($('<table/>').addClass('data').addClass('checkbox_multiple').append(tbody));    
   },
     
   edit: function() {
@@ -104,7 +108,12 @@ BoundCheckboxMultiple = BoundControl.extend({
   },
   
   save: function(value, checked) {
-        
+
+    if (this.attribute.value == null || this.attribute.value == false)
+      this.attribute.value = [];    
+    if (typeof(this.attribute.value) == 'string')    
+      this.attribute.value = this.attribute.value.split('|');
+    
     var that = this;    
     var i = this.attribute.value.indexOf(value);
     if (checked && i == -1) this.attribute.value.push(value);

data/app/controllers/caboose/blocks_controller.rb

@@ -267,14 +267,22 @@ module Caboose
           when 'name'          then b.name          = v
           when 'value'         then
             
-            if b.block_type.is_global              
-              b.value = v
-              b.update_global_value(v, @site.id)              
+            if b.block_type.is_global
+              if b.block_type.field_type == 'checkbox_multiple'
+                b.value = Block.parse_checkbox_multiple_value(b, v)
+              else                    
+                b.value = v
+              end                
+              b.update_global_value(b.value, @site.id)              
             else              
               if Caboose::parse_richtext_blocks == true && b.block_type.field_type == 'richtext' && (b.name.nil? || b.name.strip.length == 0) && (b.block_type.name != 'richtext2')                
                 b = RichTextBlockParser.parse(b, v, request.host_with_port)
-              else              
-                b.value = v
+              else
+                if b.block_type.field_type == 'checkbox_multiple'
+                  b.value = Block.parse_checkbox_multiple_value(b, v)
+                else                    
+                  b.value = v
+                end
               end
             end
         end

data/app/models/caboose/block.rb

@@ -339,5 +339,18 @@ class Caboose::Block < ActiveRecord::Base
       )", value, self.id, self.block_type_id, site_id]       
     ActiveRecord::Base.connection.execute(ActiveRecord::Base.send(:sanitize_sql_array, sql))            
   end
+  
+  # Parses the value given for a checkbox multiple block
+  def self.parse_checkbox_multiple_value(b, arr)
+    current_value = b.value ? b.value.split('|') : []
+    v = arr[0]
+    checked = arr[1].to_i == 1
+    if checked && !current_value.include?(v)
+      current_value << v      
+    elsif !checked && current_value.include?(v)
+      current_value.delete(v)
+    end
+    return current_value.join('|')
+  end
 
 end

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

@@ -90,6 +90,7 @@ end
 <style type='text/css'>
 .block { border: #ccc 1px dotted; }
 #block_<%= @block.id %>_block_type_id_container { }
+#modal_content .checkbox_multiple input[type=checkbox] { position: relative !important; }
 </style>
 <% end %>
 <% content_for :caboose_js do %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.138'
+  VERSION = '0.4.139'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.138
+  version: 0.4.139
 platform: ruby
 authors:
 - William Barry