caboose-cms 0.5.181 → 0.5.182

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjEwZDBiYWFlZjVhMGI0MTk1YzQyZWE1NDdhZTVjNzdhNzU4ZDE1Yg==
+    MzBhZmYwZjg0NGUzOTIxY2VkM2NhZjE5MjEwOWM5YTJjNmI3MTI0Yg==
   data.tar.gz: !binary |-
-    N2E3NWNjYTEwZjIyOWEwMmUxYzk0OWI1ZjYxM2E4OWNlMWZkODBhMw==
+    NDEzMWQ5N2RiZjMzNjkzZmJhN2VlOWMxNTE1ZjVhYjU0YWViNmNiZA==
 SHA512:
   metadata.gz: !binary |-
-    ZTg3MzQxNDlkZmVmYmU1M2E1NmIzMDUxZDRlZjZhZmZhMWRkNGY3YzExMDlj
-    Y2EyZGYxYmZjZTVhNTc0OGE1Yzg0NWRjNWJkOWY3MTc1N2JiNzdkZWZmZTli
-    MmE2NjkxODYyN2U5OTE2MGIwOWM4YThiM2JhNmMxMWQwM2E1YWY=
+    ZThhNTVjMDc2ODVmY2U1OWUyYjU2NzEyMmJmMzdhNTAzZTUzMzM1NGFlMzY0
+    ZGMwNGY3ZTExOGNlOTY2ZTNjZWE5NDE4Y2YzNWFhMDk0NTg5ZTdjNzNmYjc2
+    N2VhNzRhODk5M2E0MTE1NDk3OWM5MjUwZjZkYjQzNDhmNDJkZjg=
   data.tar.gz: !binary |-
-    MjA5OTM5MmNmZDE4NDQyYzgzZGRiMGMxMDRiYjkxYzlhZDZiOTkzZGE3OGQy
-    YjViZTBkNDU5MDNmOGZlZWE1Y2JlZjBhM2U5ODY2ZjQyZTRmNzk5NjBhMDY0
-    ZmE0NmJjODU3YjgxNjRkOTYxZjQ5NWY3MTc2NWM0YTY5ZDM4OTY=
+    NDM5MmI4NjZlODc2ZjEyMzc4ZTA2Zjc3YzA1OTM5NmVlZTMxZWIwZTQ4MGNi
+    ZmJhZGZiOWZkNjI3ZDY1NDUzOWVhMTYxNzFkOTQ2YmYwM2RjMDE2NmU2YzY2
+    YmMzOGE2OWM1OWM4ZTY3YTRjMDVhOTIxY2IxMWU3MTA3YjFjOTU=

data/app/controllers/caboose/sites_controller.rb

@@ -11,6 +11,10 @@ module Caboose
     # GET /admin/sites
     def admin_index
       return if !user_is_allowed('sites', 'view')
+      if @site.name != 'application'
+        @error = "You are not allowed to manage sites."
+        render :file => 'caboose/extras/error' and return
+      end
       
       @pager = PageBarGenerator.new(params, {
     		  'name_like' => '',    		  
@@ -27,31 +31,62 @@ module Caboose
     # GET /admin/sites/new
     def admin_new
       return if !user_is_allowed('sites', 'add')
+      if @site.name != 'application'
+        @error = "You are not allowed to manage sites."
+        render :file => 'caboose/extras/error' and return
+      end
+      
       @site = Site.new
     end
     
     # GET /admin/sites/:id
     def admin_edit
       return if !user_is_allowed('sites', 'edit')
+      if @site.name != 'application'
+        @error = "You are not allowed to manage sites."
+        render :file => 'caboose/extras/error' and return
+      end
+      
       @site = Site.find(params[:id])      
+      
+      # Create an admin user for the account
+      if User.where(:username => 'admin', :site_id => @site.id).exists?
+        admin_user = User.create(:username => 'admin', :site_id => @site.id)
+        admin_role = Role.where(:name => 'Admin').first
+        if admin_role
+          RoleMembership.create(:user_id => admin_user.id, :role_id => admin_role.id)
+        else
+          Caboose.log("Error: no admin role exists.")
+        end
+      end
     end
     
     # GET /admin/sites/:id/block-types
     def admin_edit_block_types
       return if !user_is_allowed('sites', 'edit')
+      if @site.name != 'application'
+        @error = "You are not allowed to manage sites."
+        render :file => 'caboose/extras/error' and return
+      end
+      
       @site = Site.find(params[:id])      
     end
     
     # GET /admin/sites/:id/delete
     def admin_delete_form
       return if !user_is_allowed('sites', 'edit')
+      if @site.name != 'application'
+        @error = "You are not allowed to manage sites."
+        render :file => 'caboose/extras/error' and return
+      end
       @site = Site.find(params[:id])      
     end
         
     # 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'
+              
       resp = StdClass.new      
       site = Site.new
       site.name = params[:name].strip
@@ -65,12 +100,24 @@ module Caboose
         resp.redirect = "/admin/sites/#{site.id}"
       end
       
+      # Create an admin user for the account
+      if User.where(:username => 'admin', :site_id => site.id).exists?
+        admin_user = User.create(:username => 'admin', :site_id => site.id)
+        admin_role = Role.where(:name => 'Admin').first
+        if admin_role
+          RoleMembership.create(:user_id => admin_user.id, :role_id => admin_role.id)
+        else
+          Caboose.log("Error: no admin role exists.")
+        end
+      end
+      
       render :json => resp
     end
     
     # 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'
 
       resp = StdClass.new     
       site = Site.find(params[:id])
@@ -92,6 +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'
       
       site = Site.find(params[:id])       
       site.logo = params[:logo]
@@ -106,6 +154,8 @@ 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'
+      
       site = Site.find(params[:id])
       site.destroy
       
@@ -118,6 +168,8 @@ 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'
+      
       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?
       sm.role = params[:role]
@@ -128,6 +180,8 @@ 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'
+      
       SiteMembership.where(:site_id => params[:id], :user_id => params[:user_id]).destroy_all        
       render :json => true
     end
@@ -135,6 +189,8 @@ 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'
+      
       options = Site.reorder('name').all.collect { |s| { 'value' => s.id, 'text' => s.name }}
       render :json => options
     end

data/app/controllers/caboose/users_controller.rb

@@ -23,25 +23,7 @@ module Caboose
       return if !user_is_allowed('users', 'view')
       
       @gen = PageBarGenerator.new(params, {
-    		  'first_name_like' => '',
-    		  'last_name_like'	=> '',
-    		  'username_like'	  => '',
-    		  'email_like' 		  => '',
-    		},{
-    		  'model'          => 'Caboose::User',
-    	    'sort'			     => 'last_name, first_name',
-    		  'desc'			     => false,
-    		  'base_url'		   => '/admin/users',
-    		  'use_url_params' => false
-    	})
-    	@users = @gen.items
-    end
-    
-    # GET /admin/users
-    def index
-      return if !user_is_allowed('users', 'view')
-      
-      @gen = PageBarGenerator.new(params, {
+          'site_id'         => @site.id,
     		  'first_name_like' => '',
     		  'last_name_like'	=> '',
     		  'username_like'	  => '',
@@ -183,6 +165,7 @@ module Caboose
       save = true
       params.each do |name,value|
         case name
+          when 'site_id'              then user.site_id             = value
           when 'first_name'           then user.first_name          = value     
           when 'last_name'            then user.last_name           = value 
           when 'username'             then user.username            = value 

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.name == 'application'        
     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,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :description             , :text   ],
         [ :under_construction_html , :text   ],
         [ :use_store               , :boolean , { :default => false }],
-        [ :logo                    , :attachment ]
+        [ :logo                    , :attachment ]        
       ],
       Caboose::SiteMembership => [
         [ :site_id     , :integer ],

data/app/views/caboose/users/index.html.erb

@@ -1,9 +1,9 @@
 <h1>Users</h1>
 
 <form action='/admin/users' method='get' class='search_form'>
-<input type='text' name='first_name_like' placeholder='First name' />
-<input type='text' name='last_name_like'  placeholder='Last name' />
-<input type='text' name='email_like'      placeholder='Email' />
+<input type='text' name='first_name_like' value="<%= @gen.params['first_name_like'] %>" placeholder='First name' />
+<input type='text' name='last_name_like'  value="<%= @gen.params['last_name_like']  %>" placeholder='Last name' />
+<input type='text' name='email_like'      value="<%= @gen.params['email_like']      %>" placeholder='Email' />
 <input type='submit' value='Search' />
 </form>
 

data/lib/caboose/version.rb

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

metadata

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