trusty-cms 7.0.2 → 7.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12bc34679296612788dd5e4b30cc2bd2c454c326d4a309016e720f770770b1a3
-  data.tar.gz: 71f1f47c70c2a0dd3173248563847d77c25f394d0bcc29cf643dceccb35a51eb
+  metadata.gz: f70f54fbf4a9bdd1942aa09ab0ce72e3d0d2936e4f3df17aa6e127bc94ef6344
+  data.tar.gz: d432e6f6aafa924bca508f829a4fdb3048526e6f081f1244002050e97d6d0d3a
 SHA512:
-  metadata.gz: b292c598d59fbdcee257afb6967f6d0b614d5522894eb0702ca308ef5f77d0ea8580796bad3f9adad3ae70d6f979ff9e4e7f99ce9d339c3644f8f0fece180d90
-  data.tar.gz: 0f0f56c552540bb1997a82764722033b6ca66652af6a341a352c695ccd6a6900acba8a783210d0931a881804d1991e6b437ef6c9cc48a004bafc3132a184a380
+  metadata.gz: e321cca958b7654771284d611961db5b1ada2dd89abd0bae3b78dd33a4ef05313f1390f93a4ff355bb0e2534bab923caf73d2fba8ae44eb3a7b9aed83cd66d86
+  data.tar.gz: 8e0e2fc24697b390b9176aa8e0f8b03a7c4cafdae22a4625da787bbea24cd8a892b6a88f20f409a7a4a4bf196c7016c2802e76c5448d4afd0d879970d7ae1ba8

data/.gitignore

@@ -18,7 +18,6 @@ rerun.txt
 *.swp
 .rvmrc
 .bundle
-.ruby-version
 .ruby-gemset
 *.rails2
 vendor/plugins/rails_upgrade

data/Gemfile

@@ -15,13 +15,13 @@ group :development, :test do
   gem 'activestorage-validator'
   gem 'acts_as_list'
   gem 'database_cleaner'
-  gem 'factory_bot_rails', '6.4.2'
+  gem 'factory_bot_rails', '6.4.4'
   gem 'file_validators'
   gem 'launchy', '~> 3.0.1'
   gem 'mysql2'
   gem 'poltergeist', '~> 1.18.1'
   gem 'pry-byebug'
-  gem 'psych', '5.1.1.1'
+  gem 'psych', '5.2.0'
   gem 'rails-observers'
   gem 'ransack'
   gem 'rspec-rails'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (7.0.1)
+    trusty-cms (7.0.3)
       RedCloth (= 4.3.3)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.3.0)
@@ -21,7 +21,7 @@ PATH
       mini_racer
       mutex_m
       mysql2
-      rack (>= 2.0.1, < 3.1.0)
+      rack (>= 2.0.1, < 3.2.0)
       rack-cache (~> 1.7)
       radius (~> 0.7)
       rails (~> 7.0.0)
@@ -39,74 +39,74 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.3)
-    actioncable (7.0.8.4)
-      actionpack (= 7.0.8.4)
-      activesupport (= 7.0.8.4)
+    actioncable (7.0.8.6)
+      actionpack (= 7.0.8.6)
+      activesupport (= 7.0.8.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.8.4)
-      actionpack (= 7.0.8.4)
-      activejob (= 7.0.8.4)
-      activerecord (= 7.0.8.4)
-      activestorage (= 7.0.8.4)
-      activesupport (= 7.0.8.4)
+    actionmailbox (7.0.8.6)
+      actionpack (= 7.0.8.6)
+      activejob (= 7.0.8.6)
+      activerecord (= 7.0.8.6)
+      activestorage (= 7.0.8.6)
+      activesupport (= 7.0.8.6)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.8.4)
-      actionpack (= 7.0.8.4)
-      actionview (= 7.0.8.4)
-      activejob (= 7.0.8.4)
-      activesupport (= 7.0.8.4)
+    actionmailer (7.0.8.6)
+      actionpack (= 7.0.8.6)
+      actionview (= 7.0.8.6)
+      activejob (= 7.0.8.6)
+      activesupport (= 7.0.8.6)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.8.4)
-      actionview (= 7.0.8.4)
-      activesupport (= 7.0.8.4)
+    actionpack (7.0.8.6)
+      actionview (= 7.0.8.6)
+      activesupport (= 7.0.8.6)
       rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.8.4)
-      actionpack (= 7.0.8.4)
-      activerecord (= 7.0.8.4)
-      activestorage (= 7.0.8.4)
-      activesupport (= 7.0.8.4)
+    actiontext (7.0.8.6)
+      actionpack (= 7.0.8.6)
+      activerecord (= 7.0.8.6)
+      activestorage (= 7.0.8.6)
+      activesupport (= 7.0.8.6)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.8.4)
-      activesupport (= 7.0.8.4)
+    actionview (7.0.8.6)
+      activesupport (= 7.0.8.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.8.4)
-      activesupport (= 7.0.8.4)
+    activejob (7.0.8.6)
+      activesupport (= 7.0.8.6)
       globalid (>= 0.3.6)
-    activemodel (7.0.8.4)
-      activesupport (= 7.0.8.4)
-    activerecord (7.0.8.4)
-      activemodel (= 7.0.8.4)
-      activesupport (= 7.0.8.4)
-    activestorage (7.0.8.4)
-      actionpack (= 7.0.8.4)
-      activejob (= 7.0.8.4)
-      activerecord (= 7.0.8.4)
-      activesupport (= 7.0.8.4)
+    activemodel (7.0.8.6)
+      activesupport (= 7.0.8.6)
+    activerecord (7.0.8.6)
+      activemodel (= 7.0.8.6)
+      activesupport (= 7.0.8.6)
+    activestorage (7.0.8.6)
+      actionpack (= 7.0.8.6)
+      activejob (= 7.0.8.6)
+      activerecord (= 7.0.8.6)
+      activesupport (= 7.0.8.6)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
     activestorage-validator (0.4.0)
       rails (>= 6.1.0)
-    activesupport (7.0.8.4)
+    activesupport (7.0.8.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    acts_as_list (1.2.2)
+    acts_as_list (1.2.4)
       activerecord (>= 6.1)
       activesupport (>= 6.1)
     acts_as_tree (2.9.1)
@@ -137,16 +137,16 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.3.4)
     crass (1.0.6)
-    css_parser (1.19.0)
+    css_parser (1.19.1)
       addressable
     csv (3.3.0)
-    database_cleaner (2.0.2)
+    database_cleaner (2.1.0)
       database_cleaner-active_record (>= 2, < 3)
     database_cleaner-active_record (2.2.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    date (3.3.4)
+    date (3.4.0)
     delocalize (1.2.0)
       rails (>= 2)
     devise (4.9.4)
@@ -159,22 +159,13 @@ GEM
     docile (1.4.1)
     drb (2.2.1)
     erubi (1.13.0)
-    execjs (2.9.1)
+    execjs (2.10.0)
     factory_bot (6.5.0)
       activesupport (>= 5.0.0)
-    factory_bot_rails (6.4.2)
-      factory_bot (~> 6.4)
+    factory_bot_rails (6.4.4)
+      factory_bot (~> 6.5)
       railties (>= 5.0.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-aarch64-linux-musl)
-    ffi (1.17.0-arm-linux-gnu)
-    ffi (1.17.0-arm-linux-musl)
-    ffi (1.17.0-arm64-darwin)
-    ffi (1.17.0-x86-linux-gnu)
-    ffi (1.17.0-x86-linux-musl)
-    ffi (1.17.0-x86_64-darwin)
-    ffi (1.17.0-x86_64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-musl)
+    ffi (1.17.0)
     file_validators (3.0.0)
       activemodel (>= 3.2)
       mime-types (>= 1.0)
@@ -200,7 +191,7 @@ GEM
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     io-console (0.7.2)
-    json (2.7.2)
+    json (2.8.1)
     kraken-io (0.1.3)
       activesupport
       httparty
@@ -217,7 +208,7 @@ GEM
     libv8-node (18.19.0.0-x86_64-linux)
     libv8-node (18.19.0.0-x86_64-linux-musl)
     logger (1.6.1)
-    loofah (2.22.0)
+    loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -231,18 +222,18 @@ GEM
     mime-types (3.6.0)
       logger
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.1001)
+    mime-types-data (3.2024.1105)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     mini_racer (0.16.0)
       libv8-node (~> 18.19.0.0)
-    minitest (5.25.1)
+    minitest (5.25.2)
     multi_xml (0.7.1)
       bigdecimal (~> 3.1)
     multipart-post (2.4.1)
-    mutex_m (0.2.0)
+    mutex_m (0.3.0)
     mysql2 (0.5.6)
-    net-imap (0.4.16)
+    net-imap (0.5.1)
       date
       net-protocol
     net-pop (0.1.2)
@@ -252,17 +243,17 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.16.7-aarch64-linux)
+    nokogiri (1.16.8-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.16.7-arm-linux)
+    nokogiri (1.16.8-arm-linux)
       racc (~> 1.4)
-    nokogiri (1.16.7-arm64-darwin)
+    nokogiri (1.16.8-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86-linux)
+    nokogiri (1.16.8-x86-linux)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-darwin)
+    nokogiri (1.16.8-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-linux)
+    nokogiri (1.16.8-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     poltergeist (1.18.1)
@@ -275,42 +266,42 @@ GEM
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    psych (5.1.1.1)
+    psych (5.2.0)
       stringio
     public_suffix (6.0.1)
     racc (1.8.1)
-    rack (2.2.9)
+    rack (2.2.10)
     rack-cache (1.17.0)
       rack (>= 0.4)
     rack-test (2.1.0)
       rack (>= 1.3)
     radius (0.7.5)
-    rails (7.0.8.4)
-      actioncable (= 7.0.8.4)
-      actionmailbox (= 7.0.8.4)
-      actionmailer (= 7.0.8.4)
-      actionpack (= 7.0.8.4)
-      actiontext (= 7.0.8.4)
-      actionview (= 7.0.8.4)
-      activejob (= 7.0.8.4)
-      activemodel (= 7.0.8.4)
-      activerecord (= 7.0.8.4)
-      activestorage (= 7.0.8.4)
-      activesupport (= 7.0.8.4)
+    rails (7.0.8.6)
+      actioncable (= 7.0.8.6)
+      actionmailbox (= 7.0.8.6)
+      actionmailer (= 7.0.8.6)
+      actionpack (= 7.0.8.6)
+      actiontext (= 7.0.8.6)
+      actionview (= 7.0.8.6)
+      activejob (= 7.0.8.6)
+      activemodel (= 7.0.8.6)
+      activerecord (= 7.0.8.6)
+      activestorage (= 7.0.8.6)
+      activesupport (= 7.0.8.6)
       bundler (>= 1.15.0)
-      railties (= 7.0.8.4)
+      railties (= 7.0.8.6)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.1)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (7.0.8.4)
-      actionpack (= 7.0.8.4)
-      activesupport (= 7.0.8.4)
+    railties (7.0.8.6)
+      actionpack (= 7.0.8.6)
+      activesupport (= 7.0.8.6)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -320,10 +311,10 @@ GEM
       activerecord (>= 6.1.5)
       activesupport (>= 6.1.5)
       i18n
-    rdoc (6.7.0)
+    rdoc (6.8.1)
       psych (>= 4.0.0)
     regexp_parser (2.9.2)
-    reline (0.5.10)
+    reline (0.5.11)
       io-console (~> 0.5)
     responders (3.1.1)
       actionpack (>= 5.2)
@@ -331,10 +322,10 @@ GEM
     roadie (5.2.1)
       css_parser (~> 1.4)
       nokogiri (~> 1.15)
-    roadie-rails (3.2.0)
-      railties (>= 5.1, < 8.0)
+    roadie-rails (3.3.0)
+      railties (>= 5.1, < 8.1)
       roadie (~> 5.0)
-    rspec-core (3.13.1)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -342,7 +333,7 @@ GEM
     rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (7.0.1)
+    rspec-rails (7.1.0)
       actionpack (>= 7.0)
       activesupport (>= 7.0)
       railties (>= 7.0)
@@ -378,13 +369,13 @@ GEM
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
     stringex (2.8.6)
-    stringio (3.1.1)
+    stringio (3.1.2)
     temple (0.10.3)
     terrapin (1.0.1)
       climate_control
     thor (1.3.2)
     tilt (2.4.0)
-    timeout (0.4.1)
+    timeout (0.4.2)
     trustygems (0.2.1)
       rake
     tzinfo (2.0.6)
@@ -403,31 +394,27 @@ GEM
 
 PLATFORMS
   aarch64-linux
-  aarch64-linux-gnu
   aarch64-linux-musl
   arm-linux
-  arm-linux-gnu
   arm-linux-musl
   arm64-darwin
   x86-linux
-  x86-linux-gnu
   x86-linux-musl
   x86_64-darwin
   x86_64-linux
-  x86_64-linux-gnu
   x86_64-linux-musl
 
 DEPENDENCIES
   activestorage-validator
   acts_as_list
   database_cleaner
-  factory_bot_rails (= 6.4.2)
+  factory_bot_rails (= 6.4.4)
   file_validators
   launchy (~> 3.0.1)
   mysql2
   poltergeist (~> 1.18.1)
   pry-byebug
-  psych (= 5.1.1.1)
+  psych (= 5.2.0)
   rails-observers
   ransack
   rspec-rails

data/INSTALL.md

@@ -2,19 +2,21 @@
 
 From within the directory containing your TrustyCMS instance:
 
-1. Create a new Rails 5.2 application (i.e. `rails new [project_name]`)
+1. Create a new Rails 7.0+ application (i.e. `rails new [project_name]`)
 
 2. Add the following gems to your Gemfile:
-  - gem 'trusty-cms'
-  - gem 'rails-observers'
+
+- gem 'trusty-cms'
+- gem 'rails-observers'
 
 3. Run `bundle install`
 
 4. Run the Trusty CMS generator to get the project into shape: `rails g trusty_cms [project_name]`.
-   - This will ask you if you want to replace a number of existing files (like application.rb); reply Y to all.
+    - This will ask you if you want to replace a number of existing files (like application.rb); reply Y to all.
 
 5. add config.extensions = [ :snippets, :clipped, :layouts, :multi_site ] to enable them in application.rb
 
 7. Add utf8 encoding to your db.yml
-   
-6. Run `bundle exec rake db:setup`, `bundle exec rake trusty_cms_engine:install:migrations`, then `bundle exec rake db:bootstrap`.
+
+6. Run `bundle exec rake db:setup`, `bundle exec rake trusty_cms:install:migrations`, then
+   `bundle exec rake db:bootstrap`.

data/README.md

@@ -2,14 +2,15 @@
 
 [![Gem Version](https://badge.fury.io/rb/trusty-cms.svg)](http://badge.fury.io/rb/trusty-cms)
 
-TrustyCMS is a branch of Radiant CMS. Its goal is to pull the Radiant framework into Rails 6 with minimal changes to its infrastructure.
+TrustyCMS is a branch of Radiant CMS. Its goal is to pull the Radiant framework into Rails 7 with minimal changes to its
+infrastructure.
 
 TrustyCMS is a no-fluff, open source content management system designed for
 small teams. It is similar to Textpattern or MovableType, but is a general
 purpose content management system (not just a blogging engine). TrustyCMS is a
-Rails engine and is built to be installed into an existing Rails 5 application as a gem.
+Rails engine and is built to be installed into an existing Rails 7 application as a gem.
 
-TravisCI: [![Build Status](https://secure.travis-ci.org/pgharts/trusty-cms.png?branch=master)](https://travis-ci.org/pgharts/trusty-cms/)
+CircleCI: [![CircleCI](https://circleci.com/gh/pgharts/trusty-cms/tree/master.svg?style=shield)](https://circleci.com/gh/pgharts/trusty-cms/tree/master)
 
 CodeClimate: [![Code Climate](https://codeclimate.com/github/codeclimate/codeclimate/badges/gpa.svg)](https://codeclimate.com/github/codeclimate/codeclimate)
 
@@ -23,14 +24,14 @@ TrustyCMS features:
 * Support for Markdown and Textile as well as traditional HTML (it's easy to
   create other filters)
 * An advanced plugin system
-* Asset management
+* Asset management & searching
 * Serve multiple sites (domains) from a single instance
 * Social sharing buttons
 * Reusable bits of content (Snippets)
 * Allows Rails controllers/actions to use Trusty CMS layouts as their "layout"
 * Operates in two modes: dev and production depending on the URL
 * A caching system which expires pages every 5 minutes
-* Built using Ruby on Rails (version 5)
+* Built using Ruby on Rails (version 7)
 
 ## License
 
@@ -53,8 +54,8 @@ See the INSTALL.md file for more instructions.
 Prerequisites:
 
 * A Github account and Git ([Github has some really good instructions](https://help.github.com/articles/set-up-git))
-* Ruby 2.2.0 or higher
-* A Rails application (currently supports version 5.0)
+* Ruby 3.1 or higher
+* A Rails application (currently supports version 7.0)
 * Bundler
 * MySQL
 * [PhantomJS >= 1.8.1](https://github.com/teampoltergeist/poltergeist/tree/v1.5.0#installing-phantomjs)
@@ -65,9 +66,9 @@ Steps:
 1. Clone your fork to your machine.
 1. `cd` into the directory you just cloned into.
 1. Follow the INSTALL.md instructions to setup an empty app with TrustyCMS installed. To modify TrustyCMS,
-point your dependency to the local path of your fork.
+   point your dependency to the local path of your fork.
 
-    gem 'trusty-cms', path: '../trusty-cms'
+   gem 'trusty-cms', path: '../trusty-cms'
 
 1. Set up your databases in your Rails application:
 
@@ -80,9 +81,13 @@ point your dependency to the local path of your fork.
 
 When you're ready to make a change:
 
-1. Add the pgharts fork as a git remote called "upstream": `git remote add upstream https://github.com/pgharts/trusty-cms.git` so that you can keep up with changes that other people make.
+1. Add the pgharts fork as a git remote called "upstream":
+   `git remote add upstream https://github.com/pgharts/trusty-cms.git` so that you can keep up with changes that other
+   people make.
 1. Fetch the remote you just added: `git fetch upstream`.
-1. Start a new branch for the change you're going to make. Name it something having to do with the changes, like "fix-queries" if you are going to try to fix some queries. Base this branch on `upstream/master` by running `git checkout -b fix-queries upstream/master`.
+1. Start a new branch for the change you're going to make. Name it something having to do with the changes, like "
+   fix-queries" if you are going to try to fix some queries. Base this branch on `upstream/master` by running
+   `git checkout -b fix-queries upstream/master`.
 1. Make your changes and commit them. Please include tests!
 1. Run the tests and make sure they pass.
 1. Push your changes to your github fork: `git push origin fix-queries`.

data/app/assets/stylesheets/admin/partials/_forms.scss

@@ -60,6 +60,19 @@ select {
   transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
 }
 
+select[multiple] {
+  height: auto;
+
+  option {
+    padding: 0.5em;
+
+    &:checked {
+      background-color: #e5e6e7;
+      font-weight: 700;
+    }
+  }
+}
+
 label {
   display: block;
 }

data/app/controllers/admin/configuration_controller.rb

@@ -5,7 +5,7 @@ class Admin::ConfigurationController < ApplicationController
   # and the show and edit views determine what set of config values is shown and made editable.
 
   before_action :initialize_config
-
+  before_action :authorize_role
   only_allow_access_to :edit, :update,
                        when: [:admin],
                        denied_url: { controller: 'admin/configuration', action: 'show' },

data/app/controllers/admin/extensions_controller.rb

@@ -1,4 +1,5 @@
 class Admin::ExtensionsController < ApplicationController
+  before_action :authorize_role
   only_allow_access_to :index,
                        when: :admin,
                        denied_url: { controller: 'pages', action: 'index' },

data/app/controllers/admin/layouts_controller.rb

@@ -1,7 +1,8 @@
 class Admin::LayoutsController < Admin::ResourceController
   paginate_models
+  before_action :authorize_role
   only_allow_access_to :index, :show, :new, :create, :edit, :update, :remove, :destroy,
                        when: %i[designer admin],
                        denied_url: { controller: 'admin/pages', action: 'index' },
-                       denied_message: 'You must have designer privileges to perform this action.'
+                       denied_message: 'You must have at least editor privileges to perform this action.'
 end

data/app/controllers/admin/resource_controller.rb

@@ -1,4 +1,5 @@
 require 'trusty_cms/resource_responses'
+
 class Admin::ResourceController < ApplicationController
   extend TrustyCms::ResourceResponses
 
@@ -95,6 +96,7 @@ class Admin::ResourceController < ApplicationController
   def will_paginate_options
     self.class.will_paginate_options || {}
   end
+
   helper_method :will_paginate_options
 
   # a convenience method that returns true if paginate_models has been called on this controller class
@@ -102,6 +104,7 @@ class Admin::ResourceController < ApplicationController
   def paginated?
     self.class.paginated == true && params[:pp] != 'all'
   end
+
   helper_method :paginated?
 
   # return a hash of page and per_page that can be used to build a will_paginate collection
@@ -145,7 +148,9 @@ class Admin::ResourceController < ApplicationController
   def model
     instance_variable_get("@#{model_symbol}") || load_model
   end
+
   alias :current_object :model
+
   def model=(object)
     instance_variable_set("@#{model_symbol}", object)
   end
@@ -155,13 +160,15 @@ class Admin::ResourceController < ApplicationController
                    model_class.find(params[:id])
                  else
                    model_class.new
-    end
+                 end
   end
 
   def models
     instance_variable_get("@#{plural_model_symbol}") || load_models
   end
+
   alias :current_objects :models
+
   def models=(objects)
     instance_variable_set("@#{plural_model_symbol}", objects)
   end
@@ -177,6 +184,7 @@ class Admin::ResourceController < ApplicationController
   def plural_model_name
     model_name.pluralize
   end
+
   alias :models_name :plural_model_name
 
   def model_symbol
@@ -186,6 +194,7 @@ class Admin::ResourceController < ApplicationController
   def plural_model_symbol
     model_name.pluralize.underscore.intern
   end
+
   alias :models_symbol :plural_model_symbol
 
   def humanized_model_name

data/app/controllers/admin/sites_controller.rb

@@ -1,5 +1,6 @@
 class Admin::SitesController < Admin::ResourceController
   helper :sites
+  before_action :authorize_role
   only_allow_access_to :index, :show, :new, :create, :edit, :update, :remove, :destroy,
                        when: :admin,
                        denied_url: { controller: 'pages', action: 'index' },

data/app/controllers/admin/snippets_controller.rb

@@ -1,7 +1,8 @@
 class Admin::SnippetsController < Admin::ResourceController
   paginate_models
+  before_action :authorize_role
   only_allow_access_to :index, :show, :new, :create, :edit, :update, :remove, :destroy,
                        when: %i[designer admin],
                        denied_url: { controller: 'admin/pages', action: 'index' },
-                       denied_message: 'You must have designer privileges to perform this action.'
+                       denied_message: 'You must have at least editor privileges to perform this action.'
 end

data/app/controllers/admin/users_controller.rb

@@ -1,5 +1,6 @@
 class Admin::UsersController < Admin::ResourceController
   paginate_models
+  before_action :authorize_role
   only_allow_access_to :index, :show, :new, :create, :edit, :update, :remove, :destroy,
                        when: :admin,
                        denied_url: { controller: 'pages', action: 'index' },
@@ -48,7 +49,7 @@ class Admin::UsersController < Admin::ResourceController
 
   def user_params
     params.require(:user).permit(:first_name, :last_name, :admin, :designer,
-                                 :password, :password_confirmation, :email, :site_id, :notes)
+                                 :password, :password_confirmation, :email, :site_id, :notes, site_ids: [])
   end
 
   def announce_cannot_delete_self