From 5cc182be32b55a52fed09547af7161a07e6331c7 Mon Sep 17 00:00:00 2001
From: EEA Jenkins <2368628+eea-jenkins@users.noreply.github.com>
Date: Mon, 30 Oct 2023 18:49:13 +0200
Subject: [PATCH 1/5] Back to devel

---
 docs/HISTORY.txt                     | 3 +++
 eea/dexterity/indicators/version.txt | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
index ad6b826..21f1184 100644
--- a/docs/HISTORY.txt
+++ b/docs/HISTORY.txt
@@ -1,6 +1,9 @@
 Changelog
 =========
 
+9.5-dev0 - (unreleased)
+---------------------------
+
 9.4 - (2023-10-30)
 ---------------------------
 * Feature: Custom Indicator @indexers for data_provenance and temportal_coverage
diff --git a/eea/dexterity/indicators/version.txt b/eea/dexterity/indicators/version.txt
index 0359f24..85d1dda 100644
--- a/eea/dexterity/indicators/version.txt
+++ b/eea/dexterity/indicators/version.txt
@@ -1 +1 @@
-9.4
+9.5-dev0

From df69418f4819ff3545e2fb018ef57dd60fd018fd Mon Sep 17 00:00:00 2001
From: Alin Voinea <contact@avoinea.com>
Date: Wed, 8 Nov 2023 18:18:52 +0200
Subject: [PATCH 2/5] docs: Update docker compose command on Mac

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index ae43e43..9ae0e14 100644
--- a/README.rst
+++ b/README.rst
@@ -27,7 +27,7 @@ Develop
     git checkout https://github.com/eea/eea.dexterity.indicators.git
     cd eea.dexterity.indicators
     git checkout develop
-    docker-compose up
+    docker compose up
 
 
 Install

From f028f3fc2e050b3ab5f96c5cc42e6ec14efd45d6 Mon Sep 17 00:00:00 2001
From: Alin Voinea <contact@avoinea.com>
Date: Wed, 13 Dec 2023 13:55:07 +0200
Subject: [PATCH 3/5] feat: Custom add permissions for IMS Indicator
 content-type - refs #259400

---
 docs/HISTORY.txt                                     |  2 ++
 eea/dexterity/indicators/configure.zcml              |  1 +
 eea/dexterity/indicators/permissions.zcml            | 12 ++++++++++++
 eea/dexterity/indicators/profiles.zcml               |  8 ++++++++
 .../indicators/profiles/default/metadata.xml         |  2 +-
 .../indicators/profiles/default/rolemap.xml          | 11 +++++++++++
 .../profiles/default/types/ims_indicator.xml         |  2 +-
 .../indicators/profiles/upgrades/to_95/rolemap.xml   | 11 +++++++++++
 .../indicators/profiles/upgrades/to_95/types.xml     |  4 ++++
 .../profiles/upgrades/to_95/types/ims_indicator.xml  |  4 ++++
 eea/dexterity/indicators/setuphandlers.py            |  1 +
 eea/dexterity/indicators/upgrades/configure.zcml     | 12 ++++++++++++
 12 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 eea/dexterity/indicators/permissions.zcml
 create mode 100644 eea/dexterity/indicators/profiles/default/rolemap.xml
 create mode 100644 eea/dexterity/indicators/profiles/upgrades/to_95/rolemap.xml
 create mode 100644 eea/dexterity/indicators/profiles/upgrades/to_95/types.xml
 create mode 100644 eea/dexterity/indicators/profiles/upgrades/to_95/types/ims_indicator.xml

diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
index 21f1184..be4d22c 100644
--- a/docs/HISTORY.txt
+++ b/docs/HISTORY.txt
@@ -3,6 +3,8 @@ Changelog
 
 9.5-dev0 - (unreleased)
 ---------------------------
+* Feature: Custom add permissions for IMS Indicator content-type
+  [avoinea - refs #259400]
 
 9.4 - (2023-10-30)
 ---------------------------
diff --git a/eea/dexterity/indicators/configure.zcml b/eea/dexterity/indicators/configure.zcml
index e76987e..c0399ae 100644
--- a/eea/dexterity/indicators/configure.zcml
+++ b/eea/dexterity/indicators/configure.zcml
@@ -5,6 +5,7 @@
 
   <i18n:registerTranslations directory="locales" />
 
+  <include file="permissions.zcml" />
   <include file="profiles.zcml" />
   <include package=".behaviors" />
   <include package=".browser" />
diff --git a/eea/dexterity/indicators/permissions.zcml b/eea/dexterity/indicators/permissions.zcml
new file mode 100644
index 0000000..a1bdfca
--- /dev/null
+++ b/eea/dexterity/indicators/permissions.zcml
@@ -0,0 +1,12 @@
+<configure
+  xmlns="http://namespaces.zope.org/zope"
+  xmlns:zcml="http://namespaces.zope.org/zcml">
+
+  <configure zcml:condition="installed AccessControl.security">
+    <permission
+      id="eea.dexterity.indicators.addIndicator"
+      title="IMS: Add Indicator"
+      />
+  </configure>
+
+</configure>
diff --git a/eea/dexterity/indicators/profiles.zcml b/eea/dexterity/indicators/profiles.zcml
index 08dff1b..4f5c35e 100644
--- a/eea/dexterity/indicators/profiles.zcml
+++ b/eea/dexterity/indicators/profiles.zcml
@@ -24,6 +24,14 @@
       post_handler=".setuphandlers.uninstall"
       />
 
+  <genericsetup:registerProfile
+      name="upgrade_95"
+      title="Upgrade profile for eea.dexterity.indicators 9.5"
+      description=""
+      directory="profiles/upgrades/to_95"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
+
   <utility
       factory=".setuphandlers.HiddenProfiles"
       name="eea.dexterity.indicators-hiddenprofiles"
diff --git a/eea/dexterity/indicators/profiles/default/metadata.xml b/eea/dexterity/indicators/profiles/default/metadata.xml
index 8142615..9c824cf 100644
--- a/eea/dexterity/indicators/profiles/default/metadata.xml
+++ b/eea/dexterity/indicators/profiles/default/metadata.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata>
-  <version>6.0</version>
+  <version>9.5</version>
 </metadata>
diff --git a/eea/dexterity/indicators/profiles/default/rolemap.xml b/eea/dexterity/indicators/profiles/default/rolemap.xml
new file mode 100644
index 0000000..5cca626
--- /dev/null
+++ b/eea/dexterity/indicators/profiles/default/rolemap.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<rolemap>
+  <permissions>
+    <permission name="IMS: Add Indicator" acquire="True">
+      <role name="Manager"/>
+      <role name="Site Administrator"/>
+      <role name="Owner"/>
+      <role name="Contributor"/>
+    </permission>
+  </permissions>
+</rolemap>
diff --git a/eea/dexterity/indicators/profiles/default/types/ims_indicator.xml b/eea/dexterity/indicators/profiles/default/types/ims_indicator.xml
index b3c8b5f..ee4c58a 100644
--- a/eea/dexterity/indicators/profiles/default/types/ims_indicator.xml
+++ b/eea/dexterity/indicators/profiles/default/types/ims_indicator.xml
@@ -20,7 +20,7 @@
   <element value="view"/>
  </property>
  <property name="default_view_fallback">False</property>
- <property name="add_permission">cmf.AddPortalContent</property>
+ <property name="add_permission">eea.dexterity.indicators.addIndicator</property>
  <property name="klass">plone.dexterity.content.Container</property>
  <property name="behaviors">
    <element value="collective.taxonomy.generated.dpsir"/>
diff --git a/eea/dexterity/indicators/profiles/upgrades/to_95/rolemap.xml b/eea/dexterity/indicators/profiles/upgrades/to_95/rolemap.xml
new file mode 100644
index 0000000..5cca626
--- /dev/null
+++ b/eea/dexterity/indicators/profiles/upgrades/to_95/rolemap.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<rolemap>
+  <permissions>
+    <permission name="IMS: Add Indicator" acquire="True">
+      <role name="Manager"/>
+      <role name="Site Administrator"/>
+      <role name="Owner"/>
+      <role name="Contributor"/>
+    </permission>
+  </permissions>
+</rolemap>
diff --git a/eea/dexterity/indicators/profiles/upgrades/to_95/types.xml b/eea/dexterity/indicators/profiles/upgrades/to_95/types.xml
new file mode 100644
index 0000000..a3ef597
--- /dev/null
+++ b/eea/dexterity/indicators/profiles/upgrades/to_95/types.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<object name="portal_types">
+ <object name="ims_indicator" meta_type="Dexterity FTI"/>
+</object>
diff --git a/eea/dexterity/indicators/profiles/upgrades/to_95/types/ims_indicator.xml b/eea/dexterity/indicators/profiles/upgrades/to_95/types/ims_indicator.xml
new file mode 100644
index 0000000..ed85a84
--- /dev/null
+++ b/eea/dexterity/indicators/profiles/upgrades/to_95/types/ims_indicator.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<object name="ims_indicator" meta_type="Dexterity FTI">
+ <property name="add_permission">eea.dexterity.indicators.addIndicator</property>
+</object>
diff --git a/eea/dexterity/indicators/setuphandlers.py b/eea/dexterity/indicators/setuphandlers.py
index c3cea64..edfc6d4 100644
--- a/eea/dexterity/indicators/setuphandlers.py
+++ b/eea/dexterity/indicators/setuphandlers.py
@@ -14,6 +14,7 @@ def getNonInstallableProfiles(self):
         """
         return [
             'eea.dexterity.indicators:uninstall',
+            'eea.dexterity.indicators:upgrade_95',
         ]
 
 
diff --git a/eea/dexterity/indicators/upgrades/configure.zcml b/eea/dexterity/indicators/upgrades/configure.zcml
index 14847f1..4356735 100644
--- a/eea/dexterity/indicators/upgrades/configure.zcml
+++ b/eea/dexterity/indicators/upgrades/configure.zcml
@@ -15,4 +15,16 @@
 
   </genericsetup:upgradeSteps>
 
+  <genericsetup:upgradeSteps
+    source="6.0"
+    destination="9.5"
+    profile="eea.dexterity.indicators:default">
+
+    <genericsetup:upgradeDepends
+       title="Custom add permission for IMS indicator"
+       import_profile="eea.dexterity.indicators:upgrade_95"
+      />
+
+  </genericsetup:upgradeSteps>
+
 </configure>

From 5a3ec93297b4cef3f364d686a2483fd503116a68 Mon Sep 17 00:00:00 2001
From: EEA Jenkins <eea-jenkins@users.noreply.github.com>
Date: Wed, 13 Dec 2023 14:01:33 +0200
Subject: [PATCH 4/5] Updated version to 9.5

---
 eea/dexterity/indicators/version.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eea/dexterity/indicators/version.txt b/eea/dexterity/indicators/version.txt
index 85d1dda..592f36e 100644
--- a/eea/dexterity/indicators/version.txt
+++ b/eea/dexterity/indicators/version.txt
@@ -1 +1 @@
-9.5-dev0
+9.5

From 6169101975957d1145ada534ce21b1af4c82de07 Mon Sep 17 00:00:00 2001
From: EEA Jenkins <eea-jenkins@users.noreply.github.com>
Date: Wed, 13 Dec 2023 14:01:36 +0200
Subject: [PATCH 5/5] Updated changelog - removed develop information

---
 docs/HISTORY.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
index be4d22c..1b8a368 100644
--- a/docs/HISTORY.txt
+++ b/docs/HISTORY.txt
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-9.5-dev0 - (unreleased)
+9.5 - (2023-12-13)
 ---------------------------
 * Feature: Custom add permissions for IMS Indicator content-type
   [avoinea - refs #259400]