pageflow 15.7.1 → 16.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1a50cfe81bd53808d9ae9dad7d9a4a66b694bd4362e5b775cc214978404cedc
-  data.tar.gz: 2071f8c941906db50038ad08e3c6e16ea3082e1f879f4f523d9c5ca8e69870d6
+  metadata.gz: f961d4e469b058f29cbba131a2ab69068547a6215111a1e9dae04040b956ddcf
+  data.tar.gz: 91b70f55119f6c1b8f8b8f4d1b98555f9d58bf73160165d7e4d16f8026384d81
 SHA512:
-  metadata.gz: 207901a660ce7258638a9ac6095cf95e9260904eec7e471ceb3e9c8a23dcc6aef00b098135b1fb1b7b81be750166426a412d91013803452f4d72ed8eef77471f
-  data.tar.gz: de7df8277fe83db6d8b0e5391868a6f94f86fb3a82622c526d71cc5656c5e12bcec1c33cf75d5a3ec420cd8af352545555433306d2f59cbc16dd45549790297a
+  metadata.gz: 82ac9717c4501f56715a6afc1a855ea9ce82f8cf1d3b6c3627ca8785960753a2967ba5114f5c348aa95608160c70b59edf338b9ea21d94fe1aee98cd7704adba
+  data.tar.gz: 0abd22f0d5bf02e29f6ac4b9fb6bc03732eec4a5e3cbd596aed79498f218e333a915bbbe1eee3b923bfe14ce213767f380c433c22180e5cb6294e38aa2694ab8

data/CHANGELOG.md

@@ -1,265 +1,55 @@
 # CHANGELOG
 
-### Version 15.7.1
+### Version 16.0.0
 
-2022-09-14
+2023-01-11
 
-[Compare changes](https://github.com/codevise/pageflow/compare/v15.7.0...v15.7.1)
-
-##### Security
-
-- Fix
-  [GHSA-qcqv-38jg-2r43](https://github.com/codevise/pageflow/security/advisories/GHSA-qcqv-38jg-2r43):
-  Insecure direct object reference in membership update endpoint
-  ([#1862](https://github.com/codevise/pageflow/pull/1862))
-- Fix
-  [GHSA-wrrw-crp8-979q](https://github.com/codevise/pageflow/security/advisories/GHSA-wrrw-crp8-979q):
-  Sensitive user data extraction via Ransack query injection
-  ([#1862](https://github.com/codevise/pageflow/pull/1862))
-
-### Version 15.7.0
-
-2022-07-18
-
-[Compare changes](https://github.com/codevise/pageflow/compare/15-6-stable...v15.7.0)
+[Compare changes](https://github.com/codevise/pageflow/compare/15-x-stable...v16.0.0)
 
 #### Core
 
-##### Rails Engine
-
-- Allow skipping encoding confirmation
-  ([#1824](https://github.com/codevise/pageflow/pull/1824))
-- Allow disabling taking snapshots when acquiring an editor lock
-  ([#1819](https://github.com/codevise/pageflow/pull/1819))
-- Theme customization
-  ([#1713](https://github.com/codevise/pageflow/pull/1713),
-   [#1771](https://github.com/codevise/pageflow/pull/1771))
-- Fix compatibility with JBuilder 2.11.3
-  ([#1757](https://github.com/codevise/pageflow/pull/1757))
-- Prevent exception when reusing file from deleted entry
-  ([#1834](https://github.com/codevise/pageflow/pull/1834))
-
-##### Admin
+##### Breaking Changes
 
-- Improve entry new form
-  ([#1822](https://github.com/codevise/pageflow/pull/1822))
-- Improve admin styles
-  ([#1816](https://github.com/codevise/pageflow/pull/1816))
-- Remove scrolling attribute from embed iframe snippet
-  ([#1759](https://github.com/codevise/pageflow/pull/1759))
-- Let admin filters entry admin by entry type
-  ([#1756](https://github.com/codevise/pageflow/pull/1756))
+- The `Theming` model has been renamed to `Site`.
+  ([#1903](https://github.com/codevise/pageflow/pull/1903),
+   [#1914](https://github.com/codevise/pageflow/pull/1914))
 
-##### Editor
+  Related associations like `Entry#theming` or
+  `Account#default_theming` have been renamed to `Entry#site` and
+  `Account#default_site` accordingly.
 
-- Rebrush editor UI
-  ([#1809](https://github.com/codevise/pageflow/pull/1809))
-- Improve supported host handling in url input
-  ([#1741](https://github.com/codevise/pageflow/pull/1741))
+- Entry templates and theme customizations now belong to sites instead
+  of accounts.
+  ([#1904](https://github.com/codevise/pageflow/pull/1904),
+   [#1915](https://github.com/codevise/pageflow/pull/1915))
 
-##### Published Entry
-
-- Use canonical entry url prefix in pretty urls
-  ([#1752](https://github.com/codevise/pageflow/pull/1752))
-- Support adding trailing slash to canonical entry urls
-  ([#1833](https://github.com/codevise/pageflow/pull/1833))
-- Support csmil HLS playlists
-  ([#1817](https://github.com/codevise/pageflow/pull/1817))
-- Load DASH on Android if hls-playlist host contains an underscore
-  ([#1791](https://github.com/codevise/pageflow/pull/1791))
-- Consent
-  ([#1705](https://github.com/codevise/pageflow/pull/1705),
-   [#1735](https://github.com/codevise/pageflow/pull/1735),
-   [#1712](https://github.com/codevise/pageflow/pull/1712))
+  Accounts can now contain multiple sites with their own set of
+  templates and customized theme.
 
 ##### Internal
 
-- Prevent full table scan in EntryRoleQuery::Scope
-  ([#1758](https://github.com/codevise/pageflow/pull/1758))
-- Upgrade Jest and Testing Library
-  ([#1721](https://github.com/codevise/pageflow/pull/1721))
-
-#### Paged Entry Type
-
-##### Published Entry
-
-- Add feature flag to use ultra image variant for paged backgrounds
-  ([#1815](https://github.com/codevise/pageflow/pull/1815))
-- Allow deactivating smart contain for video pages
-  ([#1812](https://github.com/codevise/pageflow/pull/1812))
-- Use large image variant for non-blurred media loading spinner
-  ([#1769](https://github.com/codevise/pageflow/pull/1769))
-- Consent and embed opt-in
-  ([#1716](https://github.com/codevise/pageflow/pull/1716),
-   [#1715](https://github.com/codevise/pageflow/pull/1715),
-   [#1714](https://github.com/codevise/pageflow/pull/1714),
-   [#1710](https://github.com/codevise/pageflow/pull/1710))
-
-##### Themes
-
-- Add theme option to display image on page shadow
-  ([#1704](https://github.com/codevise/pageflow/pull/1704),
-   [#1706](https://github.com/codevise/pageflow/pull/1706))
-- Add theme option to change left position of logo
-  ([#1707](https://github.com/codevise/pageflow/pull/1707))
+- Add reusable GitHub workflow to run RSpec tests
+  ([#1905](https://github.com/codevise/pageflow/pull/1905))
 
 #### Scrolled Entry Type
 
-##### Rails Engine
-
-- Additional frontend seed data
-  ([#1799](https://github.com/codevise/pageflow/pull/1799),
-   [#1801](https://github.com/codevise/pageflow/pull/1801))
-- Improve guides for Pageflow Scrolled
-  ([#1793](https://github.com/codevise/pageflow/pull/1793))
-- Move guides for Pageflow Pageflow to entry type directory
-  ([#1792](https://github.com/codevise/pageflow/pull/1792))
-- Allow registering additional frontend/editor packs
-  ([#1772](https://github.com/codevise/pageflow/pull/1772))
-- Make Webpack load chunks via asset host
-  ([#1753](https://github.com/codevise/pageflow/pull/1753),
-   [#1754](https://github.com/codevise/pageflow/pull/1754))
-- Allow transforming theme customizations
-  ([#1746](https://github.com/codevise/pageflow/pull/1746))
-- Allow passing traits to create_used_file
-  ([#1742](https://github.com/codevise/pageflow/pull/1742))
+- Simplify borders in default navigation mobile chapter menu
+  ([#1913](https://github.com/codevise/pageflow/pull/1913))
+- Add theme property for chapter link separator color
+  ([#1912](https://github.com/codevise/pageflow/pull/1912))
+- Add widget slot to default navigation
+  ([#1911](https://github.com/codevise/pageflow/pull/1911))
+- Improve theme property for default navigation progress bar height
+  ([#1910](https://github.com/codevise/pageflow/pull/1910))
+- Add theme option to use smaller menu icon variant
+  ([#1909](https://github.com/codevise/pageflow/pull/1909))
+- Allow using custom icons for share options
+  ([#1907](https://github.com/codevise/pageflow/pull/1907))
 
-##### Editor
-
-- Make default section configurable and change default to fade
-  ([#1760](https://github.com/codevise/pageflow/pull/1760),
-   [#1761](https://github.com/codevise/pageflow/pull/1761))
-- Always allow inserting all content element types
-  ([#1740](https://github.com/codevise/pageflow/pull/1740))
-- Allow moving text block ranges
-  ([#1739](https://github.com/codevise/pageflow/pull/1739))
-- Render fade transition check box in Firefox
-  ([#1728](https://github.com/codevise/pageflow/pull/1728))
-
-##### Published Entry
-
-- Add centerRagged layout variant
-  ([#1787](https://github.com/codevise/pageflow/pull/1787))
-- Prevent shadow flickering while scrolling on iOS 14
-  ([#1755](https://github.com/codevise/pageflow/pull/1755))
-- Consent for scrolled entries
-  ([#1722](https://github.com/codevise/pageflow/pull/1722))
-- Transliterate German Umlauts in entry slugs
-  ([#1720](https://github.com/codevise/pageflow/pull/1720))
-
-##### Widgets
-
-- Scrolled widget types
-  ([#1749](https://github.com/codevise/pageflow/pull/1749))
-- Do not convert SVG files uploaded as scrolled logo
-  ([#1835](https://github.com/codevise/pageflow/pull/1835))
-- Update highlighted chapter in navigation when scrolling
-  ([#1836](https://github.com/codevise/pageflow/pull/1836))
-- Allow placing widget in default navigation bar credit box
-  ([#1828](https://github.com/codevise/pageflow/pull/1828))
-- Do not pause loops when audio focus is lost
-  ([#1827](https://github.com/codevise/pageflow/pull/1827))
-- Fix unmute icon color in Safari
-  ([#1808](https://github.com/codevise/pageflow/pull/1808))
-- Ensure last item of mobile menu is visible on Android
-  ([#1807](https://github.com/codevise/pageflow/pull/1807))
-- Do not collapse navigation bar after iOS scroll bouncing
-  ([#1806](https://github.com/codevise/pageflow/pull/1806))
-- Align navigation breakpoints with theme breakpoints
-  ([#1770](https://github.com/codevise/pageflow/pull/1770))
-
-##### Content Elements
-
-- Allow more position options for content elements
-  ([#1745](https://github.com/codevise/pageflow/pull/1745))
-- Add portrait image option to inline image
-  ([#1744](https://github.com/codevise/pageflow/pull/1744))
-- Allow defining custom poster for video embeds
-  ([#1743](https://github.com/codevise/pageflow/pull/1743))
-- Make external link id generation more robust
-  ([#1802](https://github.com/codevise/pageflow/pull/1802))
-- Server generated peak data for waveforms
-  ([#1814](https://github.com/codevise/pageflow/pull/1814))
-- Inline video loops and improved unmute options
-  ([#1810](https://github.com/codevise/pageflow/pull/1810))
-- Prevent displaying black lines at the side of FitViewport elements
-  ([#1825](https://github.com/codevise/pageflow/pull/1825))
-- Allow sorting items in external links content element
-  ([#1800](https://github.com/codevise/pageflow/pull/1800))
-- Apply consist max-width to wide elements
-  ([#1798](https://github.com/codevise/pageflow/pull/1798))
-- Add iframe embed content element
-  ([#1762](https://github.com/codevise/pageflow/pull/1762),
-   [#1765](https://github.com/codevise/pageflow/pull/1765))
-- Display subtitles at the bottom of the media element
-  ([#1764](https://github.com/codevise/pageflow/pull/1764))
-- Add line break and manual hyphenation support for headings
-  ([#1751](https://github.com/codevise/pageflow/pull/1751))
-- Add feature flag to disable scrolled chart opt-in
-  ([#1732](https://github.com/codevise/pageflow/pull/1732))
-- Prevent interpreting external links as relative
-  ([#1727](https://github.com/codevise/pageflow/pull/1727))
-- Use lazy opt-in consent paradigm for scrolled embeds
-  ([#1726](https://github.com/codevise/pageflow/pull/1726))
-- Make heading text size configurable
-  ([#1725](https://github.com/codevise/pageflow/pull/1725))
-- Make it easier to recognize 360° images
-  ([#1724](https://github.com/codevise/pageflow/pull/1724))
-- Ensure contrast of text in embed opt-in
-  ([#1723](https://github.com/codevise/pageflow/pull/1723))
-- Remove option hide before/after handles
-  ([#1719](https://github.com/codevise/pageflow/pull/1719))
-- Fit viewport without displaying pillar boxes
-  ([#1718](https://github.com/codevise/pageflow/pull/1718))
-- Add missing translation for VR content element
-  ([#1711](https://github.com/codevise/pageflow/pull/1711))
-
-##### Themes
-
-- Render typography CSS rules based on scrolled theme options
-  ([#1750](https://github.com/codevise/pageflow/pull/1750))
-- Allow rendering content elements with rounded corners.
-  ([#1804](https://github.com/codevise/pageflow/pull/1804),
-   [#1805](https://github.com/codevise/pageflow/pull/1805))
-- Add content surface color properties
-  ([#1803](https://github.com/codevise/pageflow/pull/1803))
-- Restore spacing but make it theme configurable
-- Allow configuring section widths in theme
-  ([#1786](https://github.com/codevise/pageflow/pull/1786),
-   [#1795](https://github.com/codevise/pageflow/pull/1795),
-   [#1796](https://github.com/codevise/pageflow/pull/1796))
-- Allow targeting different heading sizes via theme typography rules
-  ([#1789](https://github.com/codevise/pageflow/pull/1789))
-- Text variants
-  ([#1788](https://github.com/codevise/pageflow/pull/1788))
-- Allow changing content text color via theme options
-  ([#1785](https://github.com/codevise/pageflow/pull/1785))
-- Allow overriding text block heading margins in typography rules
-  ([#1784](https://github.com/codevise/pageflow/pull/1784))
-- Let themes customize navigation bar icons
-  ([#1775](https://github.com/codevise/pageflow/pull/1775),
-   [#1776](https://github.com/codevise/pageflow/pull/1776))
-- More theme options for scrolled default navigation
-  ([#1768](https://github.com/codevise/pageflow/pull/1768))
-
-##### JavaScript API
-
-- Make scrolled rendering test helpers available outside package
-  ([#1818](https://github.com/codevise/pageflow/pull/1818))
-
-##### Internal
+[Compare changes](https://github.com/codevise/pageflow/compare/15-x-stable...master)
 
-- Fix storybook
-  ([#1826](https://github.com/codevise/pageflow/pull/1826))
-- Upgrade React minor version used in development
-  ([#1773](https://github.com/codevise/pageflow/pull/1773))
-- Transpile pageflow package in scrolled storybook
-  ([#1717](https://github.com/codevise/pageflow/pull/1717))
-- Update Video.js for SSR fix
-  ([#1701](https://github.com/codevise/pageflow/pull/1701))
-- Do not use import/export keywords in vendored deps
-  ([#1700](https://github.com/codevise/pageflow/pull/1700))
+None so far.
 
 See
-[15-6-stable branch](https://github.com/codevise/pageflow/blob/15-6-stable/CHANGELOG.md)
+[15-x-stable branch](https://github.com/codevise/pageflow/blob/15-x-stable/CHANGELOG.md)
 for previous changes.

data/README.md

@@ -171,15 +171,7 @@ If you run into problems during the installation of Pageflow, please refer to th
 
 ## Security Policy
 
-For major security issues, at least the current release series and the
-last major series will receive patches and new versions.
-
-Security related announcements will be posted to the
-[`ruby-security-ann`](https://groups.google.com/forum/#!forum/ruby-security-ann)
-mailing list.
-
-If you have found a security related bug, please contact
-`info(at)codevise.de` instead of creating a publicly visible issue.
+See [`SECURITY.md`](https://github.com/codevise/pageflow/blob/master/SECURITY.md).
 
 ## Contributing
 

data/Rakefile

@@ -21,7 +21,10 @@ end
 require 'semmy'
 Semmy::Tasks.install do |config|
   config.github_repository = 'codevise/pageflow'
-  config.source_files_with_docs_tags = '{app,lib,packages/*/src,spec/support/pageflow}/**/*.{js,jsx,rb,scss}'
+  config.source_files_with_docs_tags =
+    '{app,lib,packages/*/src,spec/support/pageflow,' \
+    'entry_types/*/{app,lib,package/src,packages/*/src}}' \
+    '/**/*.{js,jsx,rb,scss}'
 end
 
 require File.expand_path('spec/support/pageflow/dummy/app', File.dirname(__FILE__))

data/admins/pageflow/accounts.rb

@@ -59,12 +59,11 @@ module Pageflow
 
     show :title => :name do |account|
       render 'account_details', :account => account
-      render 'theming_details', :account => account
 
-      tabs_view(Pageflow.config.admin_resource_tabs.find_by_resource(account.default_theming),
+      tabs_view(Pageflow.config.admin_resource_tabs.find_by_resource(account),
                 i18n: 'pageflow.admin.resource_tabs',
-                authorize: :see_theming_admin_tab,
-                build_args: [account.default_theming])
+                authorize: :see_account_admin_tab,
+                build_args: [account])
     end
 
     controller do
@@ -76,14 +75,14 @@ module Pageflow
 
       def new
         @account = Account.new
-        @account.build_default_theming
+        @account.build_default_site
       end
 
       def create
         account_params = permitted_params[:account] || {}
         @account = Account.new(account_params)
-        @account.build_default_theming(permitted_params.fetch(:account, {})[
-                                         :default_theming_attributes])
+        @account.build_default_site(permitted_params.fetch(:account, {})[
+                                         :default_site_attributes])
         super
       end
 
@@ -100,7 +99,7 @@ module Pageflow
       end
 
       def scoped_collection
-        super.includes(:default_theming)
+        super.includes(:default_site)
       end
 
       private
@@ -115,12 +114,12 @@ module Pageflow
         [
           :name,
           :default_file_rights,
-          default_theming_attributes: permitted_theming_attributes
+          default_site_attributes: permitted_site_attributes
         ] +
           permitted_attributes_for(:account)
       end
 
-      def permitted_theming_attributes
+      def permitted_site_attributes
         [
           :cname,
           :additional_cnames,
@@ -131,15 +130,12 @@ module Pageflow
           :privacy_link_url,
           :home_url
         ] +
-          permitted_attributes_for(:theming)
+          permitted_attributes_for(:site)
       end
 
       def permitted_attributes_for(resource_name)
-        if params[:id]
-          Pageflow.config_for(resource).admin_form_inputs.permitted_attributes_for(resource_name)
-        else
-          []
-        end
+        config = params[:id] ? Pageflow.config_for(resource) : Pageflow.config
+        config.admin_form_inputs.permitted_attributes_for(resource_name)
       end
 
       def permit_feature_states(attributes)

data/admins/pageflow/entry.rb

@@ -99,13 +99,13 @@ module Pageflow
                                   .order(:name)
                               end)
 
-    searchable_select_options(name: :eligible_themings,
-                              text_attribute: :name,
+    searchable_select_options(name: :eligible_sites,
+                              text_attribute: :name_with_account_prefix,
                               scope: lambda do |params|
-                                entry = Entry.find(params[:entry_id])
-                                ThemingPolicy::Scope
-                                  .new(current_user, Theming)
-                                  .themings_allowed_for(entry.account)
+                                account = Account.find(params[:account_id])
+                                SitePolicy::Scope
+                                  .new(current_user, Site)
+                                  .sites_allowed_for(account)
                               end,
                               filter: lambda do |term, scope|
                                 scope.ransack(account_name_cont: term).result
@@ -139,11 +139,13 @@ module Pageflow
       end
     end
 
-    collection_action :entry_type_name_input do
+    collection_action :entry_site_and_type_name_input do
       account = Pageflow::Account.find(params[:account_id])
       @entry = Pageflow::Entry.new(account: account,
                                    type_name: params[:entry_type_name])
 
+      apply_entry_defaults(@entry)
+
       if authorized?(:see_entry_types, account)
         render(layout: false)
       else
@@ -151,6 +153,18 @@ module Pageflow
       end
     end
 
+    collection_action :permalink_inputs do
+      @entry = Entry.new(permitted_params[:entry])
+
+      apply_entry_defaults(@entry)
+
+      if authorized?(:create, @entry)
+        render(layout: false)
+      else
+        head :forbidden
+      end
+    end
+
     member_action :duplicate, method: :post do
       entry = Entry.find(params[:id])
       authorize!(:duplicate, entry)
@@ -185,17 +199,19 @@ module Pageflow
       helper FoldersHelper
       helper EntriesHelper
       helper EmbedCodeHelper
+      helper SitesHelper
       helper Admin::EntriesHelper
       helper Admin::FeaturesHelper
       helper Admin::FormHelper
       helper Admin::MembershipsHelper
+      helper Admin::PermalinksHelper
       helper Admin::RevisionsHelper
 
       helper_method :account_policy_scope
+      helper_method :site_policy_scope
 
       after_build do |entry|
-        entry.account ||= account_policy_scope.entry_creatable.first || Account.first
-        entry.theming ||= entry.account.default_theming
+        apply_entry_defaults(entry)
 
         if action_name == 'new' &&
            (default_entry_type = Pageflow.config.default_entry_type&.call(entry.account))
@@ -205,8 +221,8 @@ module Pageflow
       end
 
       before_update do |entry|
-        if entry.account_id_changed? && !authorized?(:update_theming_on, resource)
-          entry.theming = entry.account.default_theming
+        if entry.account_id_changed? && !authorized?(:update_site_on, resource)
+          entry.site = entry.account.default_site
         end
       end
 
@@ -217,7 +233,15 @@ module Pageflow
       end
 
       def scoped_collection
-        result = super.includes(:theming, :account, {memberships: :user}, :published_revision).references(:published_revision)
+        result =
+          super
+          .includes(:site,
+                    {permalink: :directory},
+                    :account,
+                    {memberships: :user},
+                    :published_revision)
+          .references(:published_revision)
+
         params.key?(:folder_id) ? result.where(folder_id: params[:folder_id]) : result
       end
 
@@ -233,16 +257,21 @@ module Pageflow
 
       private
 
+      def apply_entry_defaults(entry)
+        entry.account ||= account_policy_scope.entry_creatable.first || Account.first
+        entry.site ||= entry.account.default_site
+      end
+
       def account_policy_scope
         AccountPolicy::Scope.new(current_user, Account)
       end
 
-      def theming_policy_scope
-        ThemingPolicy::Scope.new(current_user, Theming)
+      def site_policy_scope
+        SitePolicy::Scope.new(current_user, Site)
       end
 
       def permitted_attributes
-        result = [:title, :type_name]
+        result = [:title, :type_name, {permalink_attributes: [:slug, :directory_id]}]
         target = if !params[:id] && current_user.admin?
                    Account.first
                  elsif params[:id]
@@ -260,10 +289,10 @@ module Pageflow
         if params[:id]
           accounts = resource.account
         else
-          accounts = account_policy_scope.themings_accessible
+          accounts = account_policy_scope.sites_accessible
         end
 
-        result += permitted_theming_attributes(accounts)
+        result += permitted_site_attributes(accounts)
 
         result
       end
@@ -275,31 +304,31 @@ module Pageflow
         end
       end
 
-      def permitted_theming_attributes(accounts)
-        if (create_or_new_action? || authorized?(:update_theming_on, resource)) &&
-           theming_params_present? && theming_in_allowed_themings_for?(accounts)
-          [:theming_id]
+      def permitted_site_attributes(accounts)
+        if (create_or_new_action? || authorized?(:update_site_on, resource)) &&
+           site_params_present? && site_in_allowed_sites_for?(accounts)
+          [:site_id]
         else
           []
         end
       end
 
-      def theming_params_present?
-        params[:entry] && params[:entry][:theming_id]
+      def site_params_present?
+        params[:entry] && params[:entry][:site_id]
       end
 
       def create_or_new_action?
-        [:create, :new].include?(action_name.to_sym)
+        [:create, :new, :permalink_inputs].include?(action_name.to_sym)
       end
 
-      def theming_in_allowed_themings_for?(accounts)
-        theming_policy_scope.themings_allowed_for(accounts)
-          .include?(Theming.find(params[:entry][:theming_id]))
+      def site_in_allowed_sites_for?(accounts)
+        site_policy_scope.sites_allowed_for(accounts)
+          .include?(Site.find(params[:entry][:site_id]))
       end
 
       def permitted_account_attributes
         if account_params_present? &&
-           (action_name.to_sym == :create || legally_moving_entry_to_other_account)
+           (create_or_new_action? || legally_moving_entry_to_other_account)
           [:account_id]
         else
           []

data/admins/pageflow/entry_templates.rb

@@ -5,7 +5,7 @@ module Pageflow
     actions :index, :new, :create, :edit, :update
     form partial: 'form'
 
-    belongs_to :account, parent_class: Pageflow::Account
+    belongs_to :site, parent_class: Pageflow::Site
 
     breadcrumb do
       breadcrumb_links.first 3
@@ -20,9 +20,7 @@ module Pageflow
       end
 
       def new
-        account = Account.find(params[:account_id])
-        @entry_template = EntryTemplate.new(
-          account: account,
+        @entry_template = parent.entry_templates.build(
           entry_type_name: params[:entry_type_name]
         )
 
@@ -32,8 +30,8 @@ module Pageflow
       end
 
       def create
-        @entry_template = EntryTemplate.new(
-          entry_template_params.merge(account_id: permitted_params[:account_id])
+        @entry_template = parent.entry_templates.build(
+          entry_template_params
         )
         @page_title = page_title('new', @entry_template.entry_type_name)
         authorize!(:create, @entry_template)
@@ -87,7 +85,7 @@ module Pageflow
       end
 
       def redirect_path
-        admin_account_path(params[:account_id], tab: 'entry_templates')
+        admin_account_site_path(parent.account, parent, tab: 'entry_templates')
       end
 
       def entry_template_params