Merge pull request #1 from verbb/craft-3

Merging 1.4.6
verbb · Apr 29, 2020 · d660b8c · d660b8c
2 parents 842f7f7 + cd73c5f
commit d660b8c
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.4.6 - 2020-04-28
+
+### Fixed
+- Prevent access to settings when `allowAdminChanges` is false
+
 ## 1.4.5 - 2020-04-16
 
 ### Fixed

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "verbb/workflow",
     "description": "A Craft CMS plugin to create a workflow for publishing entries.",
     "type": "craft-plugin",
-    "version": "1.4.5",
+    "version": "1.4.6",
     "keywords": [
         "craft",
         "cms",

diff --git a/config.codekit3 b/config.codekit3
@@ -7,7 +7,7 @@
 		"uuidString": "ECE3F09A-2816-43C6-9715-3F4A30BD28C5"
 		}
 	],
-"creatorBuild": "31934",
+"creatorBuild": "32001",
 "files": {
 	"/.github": {
 		"ft": 65536,
@@ -1165,6 +1165,10 @@
 			"active": 0,
 			"optionString": ""
 			},
+		"grouped-accessor-pairs": {
+			"active": 0,
+			"optionString": "'anyOrder'"
+			},
 		"guard-for-in": {
 			"active": 0,
 			"optionString": ""
@@ -1341,6 +1345,10 @@
 			"active": 1,
 			"optionString": "{'checkLoops': true}"
 			},
+		"no-constructor-return": {
+			"active": 0,
+			"optionString": ""
+			},
 		"no-continue": {
 			"active": 0,
 			"optionString": ""
@@ -1369,6 +1377,10 @@
 			"active": 1,
 			"optionString": ""
 			},
+		"no-dupe-else-if": {
+			"active": 1,
+			"optionString": ""
+			},
 		"no-dupe-keys": {
 			"active": 1,
 			"optionString": ""
@@ -1669,6 +1681,10 @@
 			"active": 0,
 			"optionString": ""
 			},
+		"no-setter-return": {
+			"active": 1,
+			"optionString": ""
+			},
 		"no-shadow": {
 			"active": 0,
 			"optionString": "{'builtinGlobals': false, 'hoist': 'functions', 'allow': []}"
@@ -1873,6 +1889,10 @@
 			"active": 0,
 			"optionString": "{'array': true, 'object': true}, {'enforceForRenamedProperties': false}"
 			},
+		"prefer-exponentiation-operator": {
+			"active": 0,
+			"optionString": ""
+			},
 		"prefer-named-capture-group": {
 			"active": 0,
 			"optionString": ""

diff --git a/src/templates/_layouts/index.html b/src/templates/_layouts/index.html
@@ -8,7 +8,7 @@
     {% set tabs = tabs | merge({ workflow: { label: 'Overview' | t('workflow'), url: url('workflow') } }) %}
 {% endif %}
 
-{% if currentUser.can('workflow:settings') %}
+{% if currentUser.can('workflow:settings') and craft.app.config.general.allowAdminChanges %}
     {% set tabs = tabs | merge({ settings: { label: 'Settings' | t('workflow'), url: url('workflow/settings') } }) %}
 {% endif %}