caboose-cms 0.8.39 → 0.8.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99ae29203df95c60378f40de21837b5aefedec12
-  data.tar.gz: f6835c1bc2774a5c97863ec6de0d37f1103ee939
+  metadata.gz: 22b48d7ce6d1545a3e67e1fa703b71738911a7e3
+  data.tar.gz: 1817cf46b3229a1f6952fd9827655831547caa00
 SHA512:
-  metadata.gz: 444cc4df3817be4c231b9c73874a409c6da44bd98f6ae225e489ed0cd791e3fc1ad296ce85214f2895f3195a4efac126eee74167448e09a10593b1677a8b9a42
-  data.tar.gz: 84bc7fec0c54554fdd662b6d5ed15291505df0e1abd4fb3eef81595ed6910da4f4d9e2e3f7a77ea769204c6e3d17fa2520882ad17bde7e17eab16e571d4b0a89
+  metadata.gz: c020e9dc6acc89b63678f551792d44b393a4771056b126d03d9b9952bbf57b8f0c4b4b8154032a8ecc6ace54e868ac4b22d4dc663c8e76b2bffed5582c856ac9
+  data.tar.gz: 6198d93c11ec8cbcc22984d2c65519de2b649207616072a26cc9961291525e1c2899af98da61bed77b5b7d4d5db90c99569d4d9ed7806b5f9c7cd6a0bcad6ef9

data/app/controllers/caboose/sites_controller.rb

@@ -7,8 +7,7 @@ module Caboose
     def before_action
       @page = Page.page_with_uri(request.host_with_port, '/admin')
     end
-        
-    # @route_priority 9
+            
     # @route GET /admin/sites
     def admin_index
       return if !user_is_allowed('sites', 'view')
@@ -30,7 +29,35 @@ module Caboose
     	@sites = @pager.items
     end
     
-    # @route_priority 2
+    # @route GET /admin/sites/json
+    def admin_json
+      return if !user_is_allowed('sites', 'view')
+      h = {        
+        'name'              => '',
+        'description'       => '',
+        'name_like'         => '',
+        'description_like'  => '',
+      }      
+      pager = Caboose::Pager.new(params, h, {      
+        'model' => 'Caboose::Site',
+        'sort'  => 'name',
+        'desc'  => 'false',
+        'base_url' => "/admin/sites",
+        'items_per_page' => 1000        
+      })      
+      render :json => {
+        :pager => pager,
+        :models => pager.items.as_json(:include => :domains)
+      }
+    end
+    
+    # @route GET /admin/sites/:id/json
+    def admin_json_single
+      return if !user_is_allowed('sites', 'view')
+      site = Site.find(params[:id])
+      render :json => site.as_json(:include => :domains)      
+    end
+    
     # @route GET /admin/sites/new
     def admin_new
       return if !user_is_allowed('sites', 'add')
@@ -41,22 +68,9 @@ module Caboose
       
       @site = Site.new
     end
+        
     
-    # @route_priority 8
-    # @route GET /admin/sites/:id
-    def admin_edit
-      return if !user_is_allowed('sites', 'edit')
-      if !@site.is_master
-        @error = "You are not allowed to manage sites."
-        render :file => 'caboose/extras/error' and return
-      end
-      
-      @site = Site.find(params[:id])            
-      @site.init_users_and_roles
             
-    end
-        
-    # @route_priority 6
     # @route GET /admin/sites/:id/block-types
     def admin_edit_block_types
       return if !user_is_allowed('sites', 'edit')
@@ -67,8 +81,7 @@ module Caboose
       
       @site = Site.find(params[:id])      
     end
-        
-    # @route_priority 4
+            
     # @route GET /admin/sites/:id/css
     def admin_edit_css
       return if !user_is_allowed('sites', 'edit')
@@ -78,8 +91,7 @@ module Caboose
       end      
       @site = Site.find(params[:id])      
     end
-        
-    # @route_priority 5
+            
     # @route GET /admin/sites/:id/js
     def admin_edit_js
       return if !user_is_allowed('sites', 'edit')
@@ -89,8 +101,7 @@ module Caboose
       end      
       @site = Site.find(params[:id])      
     end
-        
-    # @route_priority 7
+            
     # @route GET /admin/sites/:id/delete
     def admin_delete_form
       return if !user_is_allowed('sites', 'edit')
@@ -101,7 +112,19 @@ module Caboose
       @site = Site.find(params[:id])      
     end
     
-    # @route_priority 10
+    # @route GET /admin/sites/:id
+    def admin_edit
+      return if !user_is_allowed('sites', 'edit')
+      if !@site.is_master
+        @error = "You are not allowed to manage sites."
+        render :file => 'caboose/extras/error' and return
+      end
+      
+      @site = Site.find(params[:id])            
+      @site.init_users_and_roles
+            
+    end
+        
     # @route POST /admin/sites
     def admin_add
       return if !user_is_allowed('sites', 'add')
@@ -203,25 +226,23 @@ module Caboose
     
     # @route_priority 1
     # @route GET /admin/sites/options
+    # @route GET /admin/sites/:field-options
+    # @route GET /admin/sites/:id/:field-options    
     def options
       return if !user_is_allowed('sites', 'view')
-      render :json => { :error => "You are not allowed to manage sites." } and return if !logged_in_user.is_super_admin?
       
-      options = Site.reorder('name').all.collect { |s| { 'value' => s.id, 'text' => s.name }}
+      case params[:field]
+        when nil
+          options = logged_in_user.is_super_admin? ? Site.reorder('name').all.collect { |s| { 'value' => s.id, 'text' => s.name }} : []
+        when 'default-layout'
+          cat_ids = Caboose::BlockTypeCategory.layouts.collect{ |cat| cat.id }
+          block_types = Caboose::BlockType.includes(:block_type_site_memberships).where("block_type_category_id in (?) and block_type_site_memberships.site_id = ?", cat_ids, params[:id]).reorder(:description).all
+          options = block_types.collect do |bt|
+            { 'value' => bt.id, 'text' => bt.description } 
+          end
+      end
       render :json => options
     end
 
-    # @route_priority 3
-    # @route GET /admin/sites/:id/default-layout-options
-    def admin_default_layout_options
-      return if !user_is_allowed('sites', 'view')
-      cat_ids = Caboose::BlockTypeCategory.layouts.collect{ |cat| cat.id }
-      block_types = Caboose::BlockType.includes(:block_type_site_memberships).where("block_type_category_id in (?) and block_type_site_memberships.site_id = ?", cat_ids, params[:id]).reorder(:description).all
-      options = block_types.collect do |bt|
-        { 'value' => bt.id, 'text' => bt.description } 
-      end      
-      render :json => options
-    end
-    
   end
 end

data/app/models/caboose/site.rb

@@ -19,7 +19,29 @@ class Caboose::Site < ActiveRecord::Base
       :large => '600x800>'
     }
   do_not_validate_attachment_file_type :logo
-  attr_accessible :id, :name, :description, :under_construction_html
+  attr_accessible :id        ,         
+    :name                    ,
+    :description             ,
+    :under_construction_html ,
+    :use_store               ,
+    :use_fonts               ,
+    :logo                    ,
+    :is_master               ,
+    :allow_self_registration ,
+    :analytics_id            ,
+    :use_retargeting         ,
+    :date_js_updated         ,
+    :date_css_updated        ,
+    :default_layout_id       ,
+    :login_fail_lock_count
+            
+  before_save :validate_presence_of_store_config
+  
+  def validate_presence_of_store_config
+    if self.use_store && !Caboose::StoreConfig.where(:site_id => self.id).exists?
+      Caboose::StoreConfig.create(:site_id => self.id)
+    end
+  end
   
   def default_layout    
     return Caboose::BlockType.where(:id => self.default_layout_id).first if self.default_layout_id

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

@@ -39,6 +39,9 @@ $(document).ready(function() {
       { name: 'options_function'               , sort: 'options_function'               , show: false , bulk_edit: false, nice_name: 'Options Function'               , type: 'textarea'          , value: function(bt) { return bt.options_function;                             }, width: 400, height: 100 },
       { name: 'options'                        , sort: 'options'                        , show: false , bulk_edit: false, nice_name: 'Options'                        , type: 'textarea'          , value: function(bt) { return bt.options;                                      }, width: 400, height: 100 }            
     ],
+    search_fields: [
+      { name: 'name_like', nice_name: 'Name', type: 'text', width: 400 }      
+    ],
     new_model_text: 'New Block Type',
     new_model_fields: [
       { name: 'name', nice_name: 'Name', type: 'text', width: 400 }                      

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

@@ -1,31 +1,31 @@
 <h1>Sites</h1>
 
-<form action='/admin/sites' method='get' class='search_form'>
-<input type='text' name='name_like' placeholder='Name' />
-<input type='submit' value='Search' />
-</form>
+<div id='sites'></div>
 
-<p><a href='/admin/sites/new'>New Site</a></p>
+<% content_for :caboose_js do %>
+<%= javascript_include_tag 'caboose/model/all' %>
+<script type='text/javascript'>
 
-<% if @sites && @sites.count > 0 %>
-  <table class='data' id='users_table'>
-    <tr>
-      <%= raw @pager.sortable_table_headings({
-  				'name'               => 'Name',
-  				'description'        => 'Description',
-  				'name, description'  => 'Domains'
-  			})
-  		%>
-    </tr>
-  <% @sites.each do |site| %>
-    <tr onclick="window.location='/admin/sites/<%= site.id %>';">
-      <td><%= site.name %></td>
-      <td><%= site.description %></td>
-      <td><%= raw site.domains ? site.domains.collect{ |d| d.domain }.join('<br />') : '' %></td>    
-    </tr>
-  <% end %>
-  </table>
-  <p><%= raw @pager.generate %></p>
-<% else %>
-  <p>There are no sites right now.</p>
+$(document).ready(function() {
+  var that = this;
+  var table = new IndexTable({    
+    form_authenticity_token: '<%= form_authenticity_token %>',
+    container: 'sites',
+    base_url: '/admin/sites',            
+    fields: [
+      { name: 'name'        , sort: 'name'              , show: true , bulk_edit: false, nice_name: 'Name'        , type: 'text' , value: function(site) { return site.name;        }, width: 400 },
+      { name: 'description' , sort: 'description'       , show: true , bulk_edit: false, nice_name: 'Description' , type: 'text' , value: function(site) { return site.description; }, width: 400 },                              
+      { name: 'domains'     , sort: 'name, description' , show: true , bulk_edit: false, nice_name: 'Domains'     , type: 'text' , value: function(site) { return site.domains ? site.domains.map(function(d) { return d.id }) : []; }, text: function(site) { return site.domains ? site.domains.map(function(d) { return d.domain }).join('<br />') : ''; }, width: 400, height: 200, editable: false }      
+    ],
+    search_fields: [
+      { name: 'name_like', nice_name: 'Name', type: 'text', width: 400 }      
+    ],
+    new_model_text: 'New Site',
+    new_model_fields: [
+      { name: 'name', nice_name: 'Name', type: 'text', width: 400 }                      
+    ],    
+  });
+});
+    
+</script>
 <% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.39'
+  VERSION = '0.8.40'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.39
+  version: 0.8.40
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg