caboose-cms 0.5.182 → 0.5.183

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzBhZmYwZjg0NGUzOTIxY2VkM2NhZjE5MjEwOWM5YTJjNmI3MTI0Yg==
+    OTg4NGZmMzU2MGY0NTcxOTAwODc0NDA1MzI2MThiMTc2YzQ1ZDI0Yw==
   data.tar.gz: !binary |-
-    NDEzMWQ5N2RiZjMzNjkzZmJhN2VlOWMxNTE1ZjVhYjU0YWViNmNiZA==
+    YTk2NGI5NDJlZTIzOGRiMzcxODA0ZDYzZWU0YzAxZWY3ZGFhMWExZA==
 SHA512:
   metadata.gz: !binary |-
-    ZThhNTVjMDc2ODVmY2U1OWUyYjU2NzEyMmJmMzdhNTAzZTUzMzM1NGFlMzY0
-    ZGMwNGY3ZTExOGNlOTY2ZTNjZWE5NDE4Y2YzNWFhMDk0NTg5ZTdjNzNmYjc2
-    N2VhNzRhODk5M2E0MTE1NDk3OWM5MjUwZjZkYjQzNDhmNDJkZjg=
+    NTgxYWQ1ZjQ4ZTRhN2QzNTRmYWVhMzAxZTUwYzUzNGRmMTA1MTc4MTk1NTFh
+    NTdkMzdmMGVjMjgzYmM3N2QzOTI5ZGRkODA5ZjI0NzY5Nzc0OTljNDFkMTc0
+    NTBkNzM0ODk4ZWI1MzYyZDI0YjZmZGU3ZWU5Yzk2YWQ1YWZmYTM=
   data.tar.gz: !binary |-
-    NDM5MmI4NjZlODc2ZjEyMzc4ZTA2Zjc3YzA1OTM5NmVlZTMxZWIwZTQ4MGNi
-    ZmJhZGZiOWZkNjI3ZDY1NDUzOWVhMTYxNzFkOTQ2YmYwM2RjMDE2NmU2YzY2
-    YmMzOGE2OWM1OWM4ZTY3YTRjMDVhOTIxY2IxMWU3MTA3YjFjOTU=
+    YTI4NDYzMzM5ZjcwOTU5YzFjZGY2MTg3Yjg0Y2Q4ZThhM2RjNjczYWE2NmY1
+    MjU3Y2M5YWZkMDFiMGM0MzFmMDNiZGI2NjI2M2E5NmM1MTZiM2VmMjU2OTNj
+    MmM5NjQ2YTE3NjM5YTk4NjIxN2MzZDdjMjVlZmQ1NmUyOTRiY2U=

data/app/controllers/caboose/sites_controller.rb

@@ -11,7 +11,7 @@ module Caboose
     # GET /admin/sites
     def admin_index
       return if !user_is_allowed('sites', 'view')
-      if @site.name != 'application'
+      if !@site.is_master
         @error = "You are not allowed to manage sites."
         render :file => 'caboose/extras/error' and return
       end
@@ -31,7 +31,7 @@ module Caboose
     # GET /admin/sites/new
     def admin_new
       return if !user_is_allowed('sites', 'add')
-      if @site.name != 'application'
+      if !@site.is_master
         @error = "You are not allowed to manage sites."
         render :file => 'caboose/extras/error' and return
       end
@@ -42,7 +42,7 @@ module Caboose
     # GET /admin/sites/:id
     def admin_edit
       return if !user_is_allowed('sites', 'edit')
-      if @site.name != 'application'
+      if !@site.is_master
         @error = "You are not allowed to manage sites."
         render :file => 'caboose/extras/error' and return
       end
@@ -64,7 +64,7 @@ module Caboose
     # GET /admin/sites/:id/block-types
     def admin_edit_block_types
       return if !user_is_allowed('sites', 'edit')
-      if @site.name != 'application'
+      if !@site.is_master
         @error = "You are not allowed to manage sites."
         render :file => 'caboose/extras/error' and return
       end
@@ -75,7 +75,7 @@ module Caboose
     # GET /admin/sites/:id/delete
     def admin_delete_form
       return if !user_is_allowed('sites', 'edit')
-      if @site.name != 'application'
+      if !@site.is_master
         @error = "You are not allowed to manage sites."
         render :file => 'caboose/extras/error' and return
       end
@@ -85,7 +85,7 @@ module Caboose
     # POST /admin/sites
     def admin_add
       return if !user_is_allowed('sites', 'add')
-      render :json => { :error => "You are not allowed to manage sites." } and return if @site.name != 'application'
+      render :json => { :error => "You are not allowed to manage sites." } and return if !@site.is_master
               
       resp = StdClass.new      
       site = Site.new
@@ -117,7 +117,7 @@ module Caboose
     # PUT /admin/sites/:id
     def admin_update
       return if !user_is_allowed('sites', 'edit')
-      render :json => { :error => "You are not allowed to manage sites." } and return if @site.name != 'application'
+      render :json => { :error => "You are not allowed to manage sites." } and return if !@site.is_master
 
       resp = StdClass.new     
       site = Site.find(params[:id])
@@ -139,7 +139,7 @@ module Caboose
     # POST /admin/sites/:id/logo
     def admin_update_logo
       return if !user_is_allowed('sites', 'edit')
-      render :json => { :error => "You are not allowed to manage sites." } and return if @site.name != 'application'
+      render :json => { :error => "You are not allowed to manage sites." } and return if !@site.is_master
       
       site = Site.find(params[:id])       
       site.logo = params[:logo]
@@ -154,7 +154,7 @@ module Caboose
     # DELETE /admin/sites/:id
     def admin_delete
       return if !user_is_allowed('sites', 'delete')
-      render :json => { :error => "You are not allowed to manage sites." } and return if @site.name != 'application'
+      render :json => { :error => "You are not allowed to manage sites." } and return if !@site.is_master
       
       site = Site.find(params[:id])
       site.destroy
@@ -168,7 +168,7 @@ module Caboose
     # POST /admin/sites/:id/members
     def admin_add_member
       return if !user_is_allowed('sites', 'edit')
-      render :json => { :error => "You are not allowed to manage sites." } and return if @site.name != 'application'
+      render :json => { :error => "You are not allowed to manage sites." } and return if !@site.is_master
       
       sm = SiteMembership.where(:site_id => params[:id], :user_id => params[:user_id]).first
       sm = SiteMembership.create(:site_id => params[:id], :user_id => params[:user_id]) if sm.nil?
@@ -180,7 +180,7 @@ module Caboose
     # DELETE /admin/sites/:id/members/:user_id
     def admin_remove_member
       return if !user_is_allowed('sites', 'edit')
-      render :json => { :error => "You are not allowed to manage sites." } and return if @site.name != 'application'
+      render :json => { :error => "You are not allowed to manage sites." } and return if !@site.is_master
       
       SiteMembership.where(:site_id => params[:id], :user_id => params[:user_id]).destroy_all        
       render :json => true
@@ -189,7 +189,7 @@ module Caboose
     # GET /admin/sites/options
     def options
       return if !user_is_allowed('sites', 'view')
-      render :json => { :error => "You are not allowed to manage sites." } and return if @site.name != 'application'
+      render :json => { :error => "You are not allowed to manage sites." } and return if !@site.is_master
       
       options = Site.reorder('name').all.collect { |s| { 'value' => s.id, 'text' => s.name }}
       render :json => options

data/app/models/caboose/core_plugin.rb

@@ -12,7 +12,7 @@ class Caboose::CorePlugin < Caboose::CaboosePlugin
     item['children'] << { 'id' => 'redirects'        , 'text' => 'Permanent Redirects' , 'href' => '/admin/redirects'          , 'modal' => false } if user.is_allowed('redirects'    , 'view')
     item['children'] << { 'id' => 'permissions'      , 'text' => 'Permissions'         , 'href' => '/admin/permissions'        , 'modal' => false } if user.is_allowed('permissions'  , 'view')
     item['children'] << { 'id' => 'roles'            , 'text' => 'Roles'               , 'href' => '/admin/roles'              , 'modal' => false } if user.is_allowed('roles'        , 'view')
-    item['children'] << { 'id' => 'sites'            , 'text' => 'Sites'               , 'href' => '/admin/sites'              , 'modal' => false } if user.is_allowed('sites'        , 'view') if site.name == 'application'        
+    item['children'] << { 'id' => 'sites'            , 'text' => 'Sites'               , 'href' => '/admin/sites'              , 'modal' => false } if user.is_allowed('sites'        , 'view') if site.is_master == true        
     item['children'] << { 'id' => 'smtp'             , 'text' => 'SMTP (Mail)'         , 'href' => '/admin/smtp'               , 'modal' => false } if user.is_allowed('smtp'         , 'view')
     item['children'] << { 'id' => 'social'           , 'text' => 'Social Media'        , 'href' => '/admin/social'             , 'modal' => false } if user.is_allowed('social'       , 'view')
     item['children'] << { 'id' => 'store'            , 'text' => 'Store'               , 'href' => '/admin/store'              , 'modal' => false } if user.is_allowed('store'        , 'view')

data/app/models/caboose/schema.rb

@@ -567,7 +567,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :description             , :text   ],
         [ :under_construction_html , :text   ],
         [ :use_store               , :boolean , { :default => false }],
-        [ :logo                    , :attachment ]        
+        [ :logo                    , :attachment ],        
+        [ :is_master               , :boolean , { :default => false }]
       ],
       Caboose::SiteMembership => [
         [ :site_id     , :integer ],

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.182'
+  VERSION = '0.5.183'
 end

metadata

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