caboose-cms 0.5.12 → 0.5.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjU4YjRmMjM0MzcwNjE4MzYxNDAyMDVkOGYwMjZlZTM4YTczNGUzMg==
+    MzhiMDY0ZDQ3NGY0NzdjNzgwZTk0OTBiZmYwOGE3MGRkNTMwNDQ5NA==
   data.tar.gz: !binary |-
-    NmU0YjY0M2YxZWEzYzQ5NzY2ZjBhNmVlMGQ2NGQ3YzdlM2IzNGM2Nw==
+    MzI3NTQ1NjJkMGY5ZTFmZTc5MTE1MGZjZDZmNjM0YWE3N2Q3MzY4NQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDQ5NDZlYzA0M2VlYTUzZGE3OWQ2ZWNlMDkwZDUwYzczOGRjNWMyMTIzYzUz
-    ZDA2MjE4ZGM5ZTczMzZmZjg2ZGViZWFmYWRhZWZmYjk3MjUyZDRmYmIwNGQx
-    MmY4ZWE1MzJmOTA0ZGU2NTdlYmJmMzFmMTdiNWFjYTQ4ZDBhYzE=
+    YTI1MDI3MDA3M2QzYTViMGJjNGNiNzUzYTk2ODk2YTU1MjQwMmZjYTNiOWIz
+    MmQ3ZTk1NTczYjdkMDliMWFmNjdhMTc2NThkYjNmZDEyODQ4ZDNkZGY4YWI0
+    NWIwMGFlZjQ1ZDY2MmQ3NWFjYWE3MzcwMzliYzBiMjA0OWQ1MjI=
   data.tar.gz: !binary |-
-    YzJhNWMyNDM1NWI1MzlmODU5MDAyOTFkOTQ2ZTM3OTc0MjM4YWI5NTQ2YTEw
-    MzQ5NzMxNGExMmFiZDJkYmRlZmU4Y2FhYTdlNzNkNTc3NmNlOWI4ZDBlNDBj
-    NTU0OGMxNzM2MTZmMzdlMTFlYjBmMDA3NzgwOTA3Yjk3M2IxMTk=
+    ODk0ZWNmN2VkOWY5ZmU3MWExMTIwY2I0MTYzYzMyNTQ5YmM4ZDNhODA0ZWJk
+    NDIyMWQyMTNiMDc0NDhmNzc0ZGI1ZTA1NGQ0ODZlNWRlZTUwZmIzOTU3ZGRl
+    NWJmZjVhNzg2ZmY5ZDRjM2Q0N2ViMzRjZWE2NDE0YzZhN2YzZTM=

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

@@ -105,7 +105,9 @@ IndexTable.prototype = {
     $.each(this.fields, function(i, f) {
       if (f.editable == null) f.editable = true;
     });
-
+    this.init_local_storage();    
+    this.get_visible_columns();
+    
     $(window).on('hashchange', function() { that.refresh(); });        
     this.refresh();
   },
@@ -414,7 +416,8 @@ IndexTable.prototype = {
               f.show = checked;
               that.print();
             }      
-          });               
+          });
+          that.set_visible_column(field_name, checked);
         });        
       if (field.show)
         input.prop('checked', 'true');      
@@ -426,6 +429,36 @@ IndexTable.prototype = {
     });
     return div;
   },
+  
+  init_local_storage: function()
+  {    
+    if (!localStorage) return;
+    var that = this;
+    
+    var cols = localStorage.getItem(this.container + '_cols');
+    if (!cols)
+    {
+      cols = {};
+      $.each(this.fields, function(i, f) { cols[f.name] = f.show; });
+      localStorage.setItem(this.container + '_cols', JSON.stringify(cols));      
+    } 
+  },
+  
+  get_visible_columns: function()
+  {
+    if (!localStorage) return;        
+    var cols = JSON.parse(localStorage.getItem(this.container + '_cols'));
+    $.each(this.fields, function(i, f) { f.show = cols[f.name]; });        
+  },
+  
+  set_visible_column: function(col, checked)
+  {
+    if (!localStorage) return;
+    var that = this;    
+    var cols = JSON.parse(localStorage.getItem(this.container + '_cols'));
+    cols[col] = checked;
+    localStorage.setItem(this.container + '_cols', JSON.stringify(cols));            
+  },
 
   bulk_edit: function()
   {

data/app/controllers/caboose/block_types_controller.rb

@@ -41,7 +41,7 @@ module Caboose
     def admin_json_single
       return if !user_is_allowed('pages', 'view')
       block_type = BlockType.find(params[:id])
-      render :json => block_type      
+      render :json => block_type.as_json(:include => :sites)      
     end
 
     # GET /admin/block-types/new

data/app/controllers/caboose/cart_controller.rb

@@ -7,8 +7,7 @@ module Caboose
     end
     
     # GET /cart
-    def index
-      
+    def index      
     end
     
     # GET /cart/items

data/app/controllers/caboose/pages_controller.rb

@@ -140,7 +140,7 @@ module Caboose
     # GET /admin/pages/new
     def admin_new
       return unless user_is_allowed('pages', 'add')
-      @parent_id = params[:parent_id] ? params[:parent_id] : 1
+      @parent_id = params[:parent_id] ? params[:parent_id] : Page.where(:site_id => @site.id, :parent_id => -1).first.id
       @parent = Page.find(@parent_id)
       render :layout => 'caboose/admin'
     end
@@ -283,7 +283,7 @@ module Caboose
       end
       	
       parent = Caboose::Page.find(parent_id)                  		
-      page = Caboose::Page.new
+      page = Caboose::Page.new      
       
       if parent.nil?
         d = Domain.where(:domain => request.host_with_port).first.site_id
@@ -317,7 +317,7 @@ module Caboose
       Caboose::Page.update_authorized_for_action(page.id, 'edit', editors)
 
       # Send back the response
-      resp.redirect = "/admin/pages/#{page.id}/edit"
+      resp.redirect = "/admin/pages/#{page.id}"
       render json: resp
     end
     

data/app/views/caboose/block_types/admin_index.html.erb

@@ -22,7 +22,7 @@ $(document).ready(function() {
       { name: 'name'                           , sort: 'name'                           , show: true  , bulk_edit: false, nice_name: 'Name'                           , type: 'text'              , value: function(bt) { return bt.name;                                         }, width: 400 },
       { name: 'description'                    , sort: 'description'                    , show: false , bulk_edit: false, nice_name: 'Description'                    , type: 'text'              , value: function(bt) { return bt.description;                                  }, width: 400 },
       { name: 'field_type'                     , sort: 'field_type'                     , show: true  , bulk_edit: false, nice_name: 'Field type'                     , type: 'select'            , value: function(bt) { return bt.field_type;                                   }, width: 400, options_url: '/admin/block-types/field-type-options' },                        
-      { name: 'site_id'                        , sort: 'site_id'                        , show: false , bulk_edit: false, nice_name: 'Site'                           , type: 'checkbox-multiple' , value: function(bt) { return bt.sites ? bt.sites.map(function(s) { return s.id }) : []; }, text: function(bt) { return bt.sites ? bt.sites.map(function(s) { return s.description }).join(', ') : ''; }, width: 400, height: 200, options_url: '/admin/block-types/site-options' },
+      { name: 'site_id'                        , sort: 'site_id'                        , show: false , bulk_edit: false, nice_name: 'Site'                           , type: 'checkbox-multiple' , value: function(bt) { return bt.sites ? bt.sites.map(function(s) { return s.id }) : []; }, text: function(bt) { return bt.sites ? bt.sites.map(function(s) { return s.description && s.description.length > 0 ? s.description : s.name }).join(', ') : ''; }, width: 400, height: 200, options_url: '/admin/block-types/site-options' },
       { name: 'parent_id'                      , sort: 'parent_id'                      , show: false , bulk_edit: false, nice_name: 'Parent'                         , type: 'select'            , value: function(bt) { return bt.parent_id;                                    }, width: 400, options_url: '/admin/block-types/tree-options' },
       { name: 'block_type_category_id'         , sort: 'block_type_category_id'         , show: false , bulk_edit: false, nice_name: 'Category'                       , type: 'select'            , value: function(bt) { return bt.block_type_category_id;                       }, width: 400, options_url: '/admin/block-type-categories/tree-options' },
       { name: 'is_global'                      , sort: 'is_global'                      , show: false , bulk_edit: false, nice_name: 'Global'                         , type: 'checkbox'          , value: function(bt) { return bt.is_global ? 'Yes' : 'No';                     }, width: 20 },

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.12'
+  VERSION = '0.5.13'
 end

metadata

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