Merge branch 'craft-4' of https://github.com/verbb/field-manager into…

… craft-5 # Conflicts: # composer.json # src/controllers/BaseController.php
verbb · Dec 29, 2023 · 54adfab · 54adfab
2 parents bbff644 + 0434f4e
commit 54adfab
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.0.8 - 2023-10-25
+
+### Fixed
+- Fix an error when viewing the audit screen.
+- Fix lack of validation checks when creating or editing fields.
+
 ## 3.0.7 - 2023-07-11
 
 ### Added

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # Field Manager plugin for Craft CMS
-<img width="500" src="https://verbb.imgix.net/plugins/field-manager/field-manager-social-card.png?v=1">
+<img width="500" src="https://verbb.imgix.net/plugins/field-manager/field-manager-social-card.png?v=2">
 
 Field Manager is a Craft CMS plugin to help make it easy to manage your fields and field groups. 
 

diff --git a/src/controllers/BaseController.php b/src/controllers/BaseController.php
@@ -247,7 +247,7 @@ public function actionImport(): ?Response
  $importErrors = FieldManager::$plugin->getImport()->import($fieldsToImport);
 
  if (!$importErrors) {
- Craft::$app->getSession()->setNotice(Craft::t('field-manager', 'Imported successfully.'));
+ Craft::$app->getSession()->setSuccess(Craft::t('field-manager', 'Imported successfully.'));
 
  return null;
  } else {

diff --git a/src/templates/audit/index.html b/src/templates/audit/index.html
@@ -84,7 +84,11 @@ <h1>{{ elementGroup }}</h1>
  </th>
  </tr>
 
- {% for field in tab.layout.customFields %}
+ {% set elements = tab.elements|filter(e => e is instance of('craft\\fieldlayoutelements\\CustomField')) %}
+
+ {% for element in elements %}
+ {% set field = element.field %}
+
  <tr class="fields">
  <th>
  <span class="go">