Merge pull request #132 from eea/develop

Develop

clms/addon/profiles/default/memberdata_properties.xml

@@ -1,9 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <object name="portal_memberdata" meta_type="PlonePAS MemberData Tool">
  <property name="email"></property>
+ <property name="portal_skin"></property>
+ <property name="listed">True</property>
+ <property name="login_time">2000/01/01 00:00:00</property>
+ <property name="last_login_time">2000/01/01 00:00:00</property>
+ <property name="fullname"></property>
+ <property name="error_log_update" type="float">0.0</property>
+ <property name="language" type="string"></property>
+ <property name="ext_editor" type="boolean">False</property>
+ <property name="wysiwyg_editor" type="string"></property>
+ <property name="visible_ids" type="boolean">False</property>
+ <property name="initial_login_time"
+    type="date">2000/01/01 00:00:00</property>
  <property name="country" type="string"></property>
- <property name="affiliation"  type="string"></property>
- <property name="thematic_activity"  type="string"></property>
- <property name="sector_of_activity"  type="string"></property>
- <property name="initial_login_time" type="date">2000/01/01 00:00:00</property>
-</object>
+ <property name="affiliation" type="string"></property>
+ <property name="thematic_activity" type="string"></property>
+ <property name="sector_of_activity" type="string"></property>
+ <property name="timezone" type="string"></property>
+<property name="privacy_policy" type="boolean">False</property>
+</object>

clms/addon/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata>
-  <version>1012</version>
+  <version>1013</version>
   <dependencies>
     <dependency>profile-plone.app.registry:default</dependency>
     <dependency>profile-collective.taxonomy:default</dependency>

clms/addon/profiles/default/userschema.xml

@@ -1,5 +1,4 @@
-
-<model xmlns:i18n="http://xml.zope.org/namespaces/i18n" xmlns:marshal="http://namespaces.plone.org/supermodel/marshal" xmlns:form="http://namespaces.plone.org/supermodel/form" xmlns:security="http://namespaces.plone.org/supermodel/security" xmlns:users="http://namespaces.plone.org/supermodel/users" xmlns:lingua="http://namespaces.plone.org/supermodel/lingua" xmlns="http://namespaces.plone.org/supermodel/schema">
+<model xmlns:i18n="http://xml.zope.org/namespaces/i18n" xmlns:marshal="http://namespaces.plone.org/supermodel/marshal" xmlns:form="http://namespaces.plone.org/supermodel/form" xmlns:security="http://namespaces.plone.org/supermodel/security" xmlns:indexer="http://namespaces.plone.org/supermodel/indexer" xmlns:lingua="http://namespaces.plone.org/supermodel/lingua" xmlns:users="http://namespaces.plone.org/supermodel/users" xmlns="http://namespaces.plone.org/supermodel/schema">
   <schema name="member-fields">
     <field name="country" type="zope.schema.Choice" users:forms="In User Profile">
       <description/>
@@ -21,5 +20,9 @@
       <title>Sector of Activity</title>
       <vocabulary>collective.taxonomy.user_profile_sector_of_activity</vocabulary>
     </field>
+    <field name="privacy_policy" type="zope.schema.Bool" users:forms="In User Profile">
+    <description/>
+    <title>Privacy Policy</title>
+    </field>
   </schema>
-</model>
+</model>

clms/addon/upgrades/1013.zcml

@@ -0,0 +1,36 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:gs="http://namespaces.zope.org/genericsetup"
+    >
+
+  <gs:registerProfile
+      name="1013"
+      title="Adding Privacy Policy field"
+      description="Configuration for version 1013"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      directory="1013"
+      />
+
+
+  <gs:upgradeSteps
+      profile="clms.addon:default"
+      source="1012"
+      destination="1013"
+      >
+
+    <gs:upgradeStep
+        title="Production Update subscribers"
+        description="Configuration for version 1013"
+        handler=".v1013.upgrade"
+        />
+
+    <gs:upgradeDepends
+        title="Production Update subscribers (GS profile)"
+        description="Configuration for version 1013"
+        import_profile="clms.addon.upgrades:1013"
+        />
+
+  </gs:upgradeSteps>
+
+</configure>

clms/addon/upgrades/1013/memberdata_properties.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object name="portal_memberdata" meta_type="PlonePAS MemberData Tool">
+ <property name="email"></property>
+ <property name="portal_skin"></property>
+ <property name="listed">True</property>
+ <property name="login_time">2000/01/01 00:00:00</property>
+ <property name="last_login_time">2000/01/01 00:00:00</property>
+ <property name="fullname"></property>
+ <property name="error_log_update" type="float">0.0</property>
+ <property name="language" type="string"></property>
+ <property name="ext_editor" type="boolean">False</property>
+ <property name="wysiwyg_editor" type="string"></property>
+ <property name="visible_ids" type="boolean">False</property>
+ <property name="initial_login_time"
+    type="date">2000/01/01 00:00:00</property>
+ <property name="country" type="string"></property>
+ <property name="affiliation" type="string"></property>
+ <property name="thematic_activity" type="string"></property>
+ <property name="sector_of_activity" type="string"></property>
+ <property name="timezone" type="string"></property>
+<property name="privacy_policy" type="boolean">False</property>
+</object>

clms/addon/upgrades/1013/userschema.xml

@@ -0,0 +1,28 @@
+<model xmlns:i18n="http://xml.zope.org/namespaces/i18n" xmlns:marshal="http://namespaces.plone.org/supermodel/marshal" xmlns:form="http://namespaces.plone.org/supermodel/form" xmlns:security="http://namespaces.plone.org/supermodel/security" xmlns:indexer="http://namespaces.plone.org/supermodel/indexer" xmlns:lingua="http://namespaces.plone.org/supermodel/lingua" xmlns:users="http://namespaces.plone.org/supermodel/users" xmlns="http://namespaces.plone.org/supermodel/schema">
+  <schema name="member-fields">
+    <field name="country" type="zope.schema.Choice" users:forms="In User Profile">
+      <description/>
+      <title>Country</title>
+      <vocabulary>collective.taxonomy.user_profile_country</vocabulary>
+    </field>
+    <field name="affiliation" type="zope.schema.Choice" users:forms="In User Profile">
+      <description/>
+      <title>Affiliation</title>
+      <vocabulary>collective.taxonomy.user_profile_affiliation</vocabulary>
+    </field>
+    <field name="thematic_activity" type="zope.schema.Choice" users:forms="In User Profile">
+      <description/>
+      <title>Thematic Activity</title>
+      <vocabulary>collective.taxonomy.user_profile_thematic_activity</vocabulary>
+    </field>
+    <field name="sector_of_activity" type="zope.schema.Choice" users:forms="In User Profile">
+      <description/>
+      <title>Sector of Activity</title>
+      <vocabulary>collective.taxonomy.user_profile_sector_of_activity</vocabulary>
+    </field>
+    <field name="privacy_policy" type="zope.schema.Bool" users:forms="In User Profile">
+    <description/>
+    <title>Privacy Policy</title>
+    </field>
+  </schema>
+</model>

clms/addon/upgrades/configure.zcml

@@ -29,5 +29,6 @@
   <include file="1010.zcml" />
   <include file="1011.zcml" />
   <include file="1012.zcml" />
+  <include file="1013.zcml" />
 
 </configure>

clms/addon/upgrades/v1013.py

@@ -0,0 +1,11 @@
+""" upgrade step implementation """
+# -*- coding: utf-8 -*-
+from logging import getLogger
+
+logger = getLogger(__name__)
+
+
+def upgrade(setup_tool=None):
+    """upgrade function"""
+    logger.info("Running upgrade (Python): v1013")
+    logger.info("done")

clms/addon/version.txt

@@ -1 +1 @@
-11.9
+12.0

docs/HISTORY.txt

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+12.0 - (2024-11-05)
+---------------------------
+* Change: Develop
+  [ana-oprea]
+
 11.9 - (2024-09-26)
 ---------------------------
 * Change: Fix link in tables for existing content