From 970d71531d56e8338ab842c31caf761796ef046c Mon Sep 17 00:00:00 2001 From: Pete Eveleigh Date: Fri, 13 Mar 2026 15:18:08 +0000 Subject: [PATCH 1/6] Check for sections and entries on settings page. Show message if none. --- src/templates/settings.twig | 202 ++++++++++++----------- src/translations/en/entry-type-rules.php | 2 + 2 files changed, 106 insertions(+), 98 deletions(-) diff --git a/src/templates/settings.twig b/src/templates/settings.twig index 5489ddd..08f3f9a 100755 --- a/src/templates/settings.twig +++ b/src/templates/settings.twig @@ -40,104 +40,110 @@ {% endfor %} {% block content %} - - {% if configOverride %} -

- - - {{ "The Entry Type Rules plugin settings are being overridden in the 'config/entry-type-rules.php' file."|t('entry-type-rules') }} -

-
- {% endif %} - - {{ actionInput('entry-type-rules/settings/save-settings') }} - - {{ forms.hidden({ - name: 'pluginHandle', - value: 'entry-type-rules'}) - }} - - {% for section in sections | filter(section => section.type != 'single') %} - - {% if not loop.first %}
{% endif %} - -
-

{{ section.name ~ ' ' ~ section.type|capitalize ~ ' ' ~ "Section"|t('entry-type-rules') }}

- - - - - - - - - - {% for entryType in section.entryTypes %} - {% set entryTypeCount = craft.entries.section(section.handle).type(entryType.handle).count %} - {% set limitValue = settings.sections[section.handle][entryType.handle].limit|default('') %} - - - - - - {% endfor %} - -
- - {{ "Entry Type"|t('entry-type-rules') }} - {{ "The entry type and its current total entry count."|t('entry-type-rules') }} - - - - {{ "Limit"|t('entry-type-rules') }} - - {{ "Limit the number of entries for the entry type."|t('entry-type-rules') }}
- {{ "Leave blank or set to zero to remove limits for the entry type."|t('entry-type-rules') }} - - - 		- - {{ "User Groups"|t('entry-type-rules') }} - - {{ "Limit which user groups can add new entries for the entry type."|t('entry-type-rules') }}
- {{ "Admin users will always be able to add new entries."|t('entry-type-rules') }} - - -
- {{ entryType.name }} {{ entryType.handle }}
- - {{ "Entries"|t('entry-type-rules') }}: {{ entryTypeCount }} - - - 		-
- {{ forms.textField({ - id: (entryType.handle ~ '_limit'), - name: ('sections[' ~ section.handle ~ ']['~ entryType.handle ~ '][limit]'), - type: 'number', - size: 5, - min: 0, - value: limitValue, - placeholder: '0', - unit: "Entries"|t('entry-type-rules'), - }) }} -
- 		- {{ forms.checkboxSelectField({ - id: (entryType.handle ~ '_userGroups'), - name: ('sections[' ~ section.handle ~ ']['~ entryType.handle ~ '][userGroups]'), - options: groupOptions, - showAllOption: true, - allValue: '', - values: settings.sections[section.handle][entryType.handle].userGroups|default('') - }) }} -
-
- - {% endfor %} + {% if sections is empty %} +

{{ 'configureSections'|t('entry-type-rules')|raw }}

+ {% elseif not craft.entries.count() %} +

{{ 'configureEntries'|t('entry-type-rules')|raw }}

+ {% else %} + + {% if configOverride %} +

+ + + {{ "The Entry Type Rules plugin settings are being overridden in the 'config/entry-type-rules.php' file."|t('entry-type-rules') }} +

+
+ {% endif %} + + {{ actionInput('entry-type-rules/settings/save-settings') }} + + {{ forms.hidden({ + name: 'pluginHandle', + value: 'entry-type-rules'}) + }} + + {% for section in sections | filter(section => section.type != 'single') %} + + {% if not loop.first %}
{% endif %} + +
+

{{ section.name ~ ' ' ~ section.type|capitalize ~ ' ' ~ "Section"|t('entry-type-rules') }}

+ + + + + + + + + + {% for entryType in section.entryTypes %} + {% set entryTypeCount = craft.entries.section(section.handle).type(entryType.handle).count %} + {% set limitValue = settings.sections[section.handle][entryType.handle].limit|default('') %} + + + + + + {% endfor %} + +
+ + {{ "Entry Type"|t('entry-type-rules') }} + {{ "The entry type and its current total entry count."|t('entry-type-rules') }} + + + + {{ "Limit"|t('entry-type-rules') }} + + {{ "Limit the number of entries for the entry type."|t('entry-type-rules') }}
+ {{ "Leave blank or set to zero to remove limits for the entry type."|t('entry-type-rules') }} + + + 		+ + {{ "User Groups"|t('entry-type-rules') }} + + {{ "Limit which user groups can add new entries for the entry type."|t('entry-type-rules') }}
+ {{ "Admin users will always be able to add new entries."|t('entry-type-rules') }} + + +
+ {{ entryType.name }} {{ entryType.handle }}
+ + {{ "Entries"|t('entry-type-rules') }}: {{ entryTypeCount }} + + + 		+
+ {{ forms.textField({ + id: (entryType.handle ~ '_limit'), + name: ('sections[' ~ section.handle ~ ']['~ entryType.handle ~ '][limit]'), + type: 'number', + size: 5, + min: 0, + value: limitValue, + placeholder: '0', + unit: "Entries"|t('entry-type-rules'), + }) }} +
+ 		+ {{ forms.checkboxSelectField({ + id: (entryType.handle ~ '_userGroups'), + name: ('sections[' ~ section.handle ~ ']['~ entryType.handle ~ '][userGroups]'), + options: groupOptions, + showAllOption: true, + allValue: '', + values: settings.sections[section.handle][entryType.handle].userGroups|default('') + }) }} +
+
+ + {% endfor %} + {% endif %} {% endblock %} diff --git a/src/translations/en/entry-type-rules.php b/src/translations/en/entry-type-rules.php index 2739c4a..103df2f 100755 --- a/src/translations/en/entry-type-rules.php +++ b/src/translations/en/entry-type-rules.php @@ -38,4 +38,6 @@ 'Limit which user groups can add new entries for the entry type.' => 'Limit which user groups can add new entries for the entry type.', 'Admin users will always be able to add new entries.' => 'Admin users will always be able to add new entries.', 'Entries' => 'Entries', + 'configureSections' => 'You need to configure some Sections first.', + 'configureEntries' => 'You need to create some entries first.

', ]; From 7a36b4f961e36ac6148cb536f015a02c53e5fd7f Mon Sep 17 00:00:00 2001 From: Pete Eveleigh Date: Fri, 13 Mar 2026 15:33:08 +0000 Subject: [PATCH 2/6] get site url and cp trigger dynamically --- src/templates/settings.twig | 8 ++++++-- src/translations/en/entry-type-rules.php | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/templates/settings.twig b/src/templates/settings.twig index 08f3f9a..bed99b7 100755 --- a/src/templates/settings.twig +++ b/src/templates/settings.twig @@ -41,9 +41,13 @@ {% block content %} {% if sections is empty %} -

{{ 'configureSections'|t('entry-type-rules')|raw }}

+
+

{{ 'configureSections'|t('entry-type-rules', {'url' : siteUrl ~ craft.app.config.general.cpTrigger ~ '/settings/sections'})|raw }}

+
{% elseif not craft.entries.count() %} -

{{ 'configureEntries'|t('entry-type-rules')|raw }}

+
+

{{ 'configureEntries'|t('entry-type-rules', {'url' : siteUrl ~ craft.app.config.general.cpTrigger ~ '/entries'})|raw }}

+
{% else %} {% if configOverride %} diff --git a/src/translations/en/entry-type-rules.php b/src/translations/en/entry-type-rules.php index 103df2f..e11c6ff 100755 --- a/src/translations/en/entry-type-rules.php +++ b/src/translations/en/entry-type-rules.php @@ -38,6 +38,6 @@ 'Limit which user groups can add new entries for the entry type.' => 'Limit which user groups can add new entries for the entry type.', 'Admin users will always be able to add new entries.' => 'Admin users will always be able to add new entries.', 'Entries' => 'Entries', - 'configureSections' => 'You need to configure some Sections first.', - 'configureEntries' => 'You need to create some entries first.

', + 'configureSections' => 'You need to configure some Sections first.', + 'configureEntries' => 'You need to create some entries first.

', ]; From c71e6559850bff7abb6e34712d93aece6ba3b5d9 Mon Sep 17 00:00:00 2001 From: Pete Eveleigh Date: Fri, 13 Mar 2026 15:45:22 +0000 Subject: [PATCH 3/6] trying to fix ecs issue only showing on Github --- src/assetbundles/entrytyperules/EntryTypeRulesAsset.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/assetbundles/entrytyperules/EntryTypeRulesAsset.php b/src/assetbundles/entrytyperules/EntryTypeRulesAsset.php index 6ee8034..07826ea 100755 --- a/src/assetbundles/entrytyperules/EntryTypeRulesAsset.php +++ b/src/assetbundles/entrytyperules/EntryTypeRulesAsset.php @@ -1,4 +1,5 @@ Date: Fri, 13 Mar 2026 15:47:31 +0000 Subject: [PATCH 4/6] applying esc fixes --- src/assetbundles/entrytyperules/EntryTypeRulesSettingsAsset.php | 1 + src/config.php | 1 + src/controllers/DefaultController.php | 1 + src/translations/en/entry-type-rules.php | 1 + 4 files changed, 4 insertions(+) diff --git a/src/assetbundles/entrytyperules/EntryTypeRulesSettingsAsset.php b/src/assetbundles/entrytyperules/EntryTypeRulesSettingsAsset.php index a0be543..2d5016b 100644 --- a/src/assetbundles/entrytyperules/EntryTypeRulesSettingsAsset.php +++ b/src/assetbundles/entrytyperules/EntryTypeRulesSettingsAsset.php @@ -1,4 +1,5 @@ Date: Sat, 14 Mar 2026 14:10:51 +0000 Subject: [PATCH 5/6] set section and entries urls properly run composer update --- src/Plugin.php | 3 +++ src/controllers/DefaultController.php | 1 + src/templates/settings.twig | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Plugin.php b/src/Plugin.php index b0975c1..01a0ab2 100755 --- a/src/Plugin.php +++ b/src/Plugin.php @@ -9,6 +9,7 @@ use craft\base\Plugin as BasePlugin; use craft\elements\Entry; use craft\events\DefineHtmlEvent; +use craft\helpers\UrlHelper; use craft\web\Controller; use craft\web\View; use fostercommerce\entrytyperules\assetbundles\entrytyperules\EntryTypeRulesAsset; @@ -73,6 +74,8 @@ public function getSettingsResponse(): mixed [ 'settings' => $this->getSettings(), 'overrides' => $overrides, + 'sectionsUrl' => UrlHelper::cpUrl('settings/sections'), + 'entriesUrl' => UrlHelper::cpUrl('entries'), ] ); } diff --git a/src/controllers/DefaultController.php b/src/controllers/DefaultController.php index 62747f8..6531f76 100755 --- a/src/controllers/DefaultController.php +++ b/src/controllers/DefaultController.php @@ -15,6 +15,7 @@ use Craft; use craft\elements\Entry; +use craft\helpers\UrlHelper; use craft\web\Application; use craft\web\Controller; use craft\web\User; diff --git a/src/templates/settings.twig b/src/templates/settings.twig index bed99b7..8a675ae 100755 --- a/src/templates/settings.twig +++ b/src/templates/settings.twig @@ -42,11 +42,11 @@ {% block content %} {% if sections is empty %}
-

{{ 'configureSections'|t('entry-type-rules', {'url' : siteUrl ~ craft.app.config.general.cpTrigger ~ '/settings/sections'})|raw }}

+

{{ 'configureSections'|t('entry-type-rules', {'url' : sectionsUrl })|raw }}

{% elseif not craft.entries.count() %}
-

{{ 'configureEntries'|t('entry-type-rules', {'url' : siteUrl ~ craft.app.config.general.cpTrigger ~ '/entries'})|raw }}

+

{{ 'configureEntries'|t('entry-type-rules', {'url' : entriesUrl })|raw }}

{% else %} From 6f3eac6be299366fbacf8645c267a69600843da7 Mon Sep 17 00:00:00 2001 From: Pete Eveleigh Date: Sat, 14 Mar 2026 14:11:46 +0000 Subject: [PATCH 6/6] ecs fix --- src/controllers/DefaultController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/controllers/DefaultController.php b/src/controllers/DefaultController.php index 6531f76..62747f8 100755 --- a/src/controllers/DefaultController.php +++ b/src/controllers/DefaultController.php @@ -15,7 +15,6 @@ use Craft; use craft\elements\Entry; -use craft\helpers\UrlHelper; use craft\web\Application; use craft\web\Controller; use craft\web\User;