caboose-cms 0.4.117 → 0.4.118

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2FlYzBlYWM0ODEzOTEyYmViMjhhYWI1Y2UxN2FhZTM4YmEyM2M4NA==
+    ZTZmMTJmMzc3ZmZmMmNiYjJkY2I3MDk3NmMyZWJjOTZiZTZiM2NhMg==
   data.tar.gz: !binary |-
-    MTk2ZDEzMDhjMjYxMTlkMDQ1ZmNjODI1MjBkYTI5OGNmNDg1YjRmZA==
+    Mzg2OTJjZDFmM2NjOGNkZmQ1YjMwOWVjMTE0OTFmZTVkMWNiOTg2Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWJjYzcxMDJmYjlhZjdjZTIzZmI2OTU2NWFmOTU0ODBhM2IwNzkwNWU1NGYz
-    OWFiMTliNWM5ODFiYmE5MTEzMTExZjRkMmUxNjhlMWI4NWE3YjViMGJkNDJh
-    MmNhZWMwN2QzMGQ2MTNkZGFmNmNjZTkyNjVmYWFlYjIyMjljMWE=
+    ZTE3NmE3MWUyN2Y2MmU3ZDhjMWE4OTI2ZWQwNGU0OTFiZDg1Y2Y3ZWY3Mzg4
+    MTNlNzdmMzA1ODdmZjllYmQ1NGI3NzZmZjY2NWRiYzAwNjJiN2ZlN2E0MjI0
+    MjgxOGQ4MTI5MTBkNzE5MjVhMTdhMDJmODVlNmYxODMzZjk2OWM=
   data.tar.gz: !binary |-
-    ODhlODYxZDcwYmZjYzk5MTI2ZTIzY2Y1M2ZkYjk5NmRhNTU5YTg0OGFjNTBk
-    ZWQ0NjdmZThlZGRiYTBiZDM1ZDA4N2M3NzU2YjhjOTdiMzBhZjU5MjNmMTZk
-    NmIwMTNjNTUwODMzZWQwZjAzNGI1N2MwNjA2YmU1MzRjMmI2YzA=
+    MjBhYzg5ODA3ZGFiNTU1YzI1ZTEzY2Y3Mzk2NDhlMDBlODE1YzhjOTYwYzkw
+    NTdiNmU2ZTU5N2NjZDlkNmY3NDNmM2Y4NWEyMzQ2OTlhMDcyNzNmZTA5NWJl
+    M2IxY2IyZjBjYzQ5MWQ1N2E1NDdjZWJiNjdlYTc1MGEyNTI1ZjU=

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

@@ -52,6 +52,10 @@ IndexTable.prototype = {
   
   // The post/get in the original request
   post_get: false,
+    
+  allow_bulk_edit: true,
+  allow_bulk_delete: true,
+  allow_duplicate: true,
       
   //============================================================================
   // End of required parameters
@@ -142,11 +146,13 @@ IndexTable.prototype = {
       data: that.pager_params,
       success: function(resp) {
         for (var thing in resp['pager'])
-          that.pager_params[thing] = resp['pager'][thing];        
+          that.pager_params[thing] = resp['pager'][thing];                
         that.models = resp['models'];
-        $.each(that.models, function(i, m) {
-          m.id = parseInt(m.id);                    
-        });
+        for (var i=0; i<that.models.length; i++)
+        {
+          var m = that.models[i];                              
+          m.id = parseInt(m.id);          
+        }
         that.print();
         
         // Set the history state
@@ -180,7 +186,11 @@ IndexTable.prototype = {
     }
     else
     {
-      var columns = this.column_checkboxes();      
+      var columns = this.column_checkboxes();            
+      var controls = $('<p/>');
+      if (this.allow_bulk_edit   ) controls.append($('<input/>').attr('type', 'button').attr('id', 'bulk_edit'  ).val('Bulk Edit'  ).click(function(e) { that.bulk_edit();   })).append(' ');
+      if (this.allow_bulk_delete ) controls.append($('<input/>').attr('type', 'button').attr('id', 'bulk_delete').val('Bulk Delete').click(function(e) { that.bulk_delete(); })).append(' ');
+      if (this.allow_duplicate   ) controls.append($('<input/>').attr('type', 'button').attr('id', 'duplicate'  ).val('Duplicate'  ).click(function(e) { that.duplicate();   }));
       
       $('#' + that.container).empty()
         .append($('<a/>').attr('href', '#').html('Show/Hide Columns').click(function(e) { e.preventDefault(); $('#columns').slideToggle(); }))          
@@ -188,11 +198,7 @@ IndexTable.prototype = {
         .append($('<div/>').attr('id', 'table_container').append(table))        
         .append($('<div/>').attr('id', 'pager').append(pager))        
         .append($('<div/>').attr('id', 'message'))
-        .append($('<p/>')
-          .append($('<input/>').attr('type', 'button').attr('id', 'bulk_edit'  ).val('Bulk Edit'  ).click(function(e) { that.bulk_edit();   })).append(' ')
-          .append($('<input/>').attr('type', 'button').attr('id', 'bulk_delete').val('Bulk Delete').click(function(e) { that.bulk_delete(); })).append(' ')
-          .append($('<input/>').attr('type', 'button').attr('id', 'duplicate'  ).val('Duplicate'  ).click(function(e) { that.duplicate();   }))
-        );
+        .append(controls);        
       $('#columns').hide();
     }    
       
@@ -222,9 +228,11 @@ IndexTable.prototype = {
   
   table_headers: function()
   {
-    var that = this;
-    var tr = $('<tr/>').append($('<th/>').html('&nbsp;'));
-    //var url = this.base_url + this.base_url.indexOf('?') > -1 ? '&' : '?';
+    var that = this;    
+    var tr = $('<tr/>');
+    
+    if (this.allow_bulk_edit || this.allow_bulk_delete || this.allow_duplicate)   
+      tr.append($('<th/>').html('&nbsp;'));    
     
     $.each(this.fields, function(i, field) {
       if (field.show)
@@ -236,7 +244,7 @@ IndexTable.prototype = {
           sort: field.sort,
           desc: (that.pager_params.sort == field.sort ? (parseInt(that.pager_params.desc) == 1 ? '0' : '1') : '0')
         });
-        
+                
         var input = $('<input/>').attr('type', 'checkbox').attr('id', 'quick_edit_' + field.name).val(field.name)            
           .change(function() {
             that.quick_edit_field = $(this).prop('checked') ? $(this).val() : false;
@@ -259,27 +267,31 @@ IndexTable.prototype = {
   table_row: function(m)
   {
     var that = this;
-    var checkbox = $('<input/>').attr('type', 'checkbox').attr('id', 'model_' + m.id)        
-      .click(function(e) {           
-        e.stopPropagation();
-        var model_id = $(this).attr('id').replace('model_', '');          
-        if (model_id == 'NaN')
-          alert("Error: invalid model id.");
-        else
-        {
-          model_id = parseInt(model_id);
-          var checked = $(this).prop('checked');
-          var i = that.model_ids.indexOf(model_id);                    
-          if (checked && i == -1) that.model_ids.push(model_id);
-          if (!checked && i > -1) that.model_ids.splice(i, 1);
-        }
-      });
-    if (that.model_ids.indexOf(m.id) > -1)
-      checkbox.prop('checked', 'true');      
+    
+    var tr = $('<tr/>').attr('id', 'model_row_' + m.id); 
       
-    var tr = $('<tr/>')
-      .attr('id', 'model_row_' + m.id)                
-      .append($('<td/>').append(checkbox));
+    if (that.allow_bulk_edit || that.allow_bulk_delete || that.allow_duplicate)
+    {
+      var checkbox = $('<input/>').attr('type', 'checkbox').attr('id', 'model_' + m.id)        
+        .click(function(e) {           
+          e.stopPropagation();
+          var model_id = $(this).attr('id').replace('model_', '');          
+          if (model_id == 'NaN')
+            alert("Error: invalid model id.");
+          else
+          {
+            model_id = parseInt(model_id);
+            var checked = $(this).prop('checked');
+            var i = that.model_ids.indexOf(model_id);                    
+            if (checked && i == -1) that.model_ids.push(model_id);
+            if (!checked && i > -1) that.model_ids.splice(i, 1);
+          }
+        });
+      if (that.model_ids.indexOf(m.id) > -1)
+        checkbox.prop('checked', 'true');  
+      tr.append($('<td/>').append(checkbox));
+    }
+
     if (!that.quick_edit_field)
     {
       tr.click(function(e) {

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.117'
+  VERSION = '0.4.118'
 end

metadata

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