-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Branch: refs/heads/master Date: 2022-08-25T08:58:32+02:00 Author: ale-rt (ale-rt) <alessandro.pisa@gmail.com> Commit: plone/plone.app.users@0832753 Added a timezone setter Add a timezone setter that prevents `None` to be stored as a timezone. Save it as an empty string instead. Fixes #109 Files changed: A news/109.bugfix M plone/app/users/browser/account.py Repository: plone.app.users Branch: refs/heads/master Date: 2022-08-25T17:26:16+02:00 Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> Commit: plone/plone.app.users@a1de9d7 Merge pull request #110 from plone/109.bugfix Added a timezone setter Files changed: A news/109.bugfix M plone/app/users/browser/account.py
- Loading branch information
Showing
1 changed file
with
18 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,53 +1,39 @@ | ||
| Repository: Products.CMFPlone | ||
| Repository: plone.app.users | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2022-08-25T08:40:00+02:00 | ||
| Date: 2022-08-25T08:58:32+02:00 | ||
| Author: ale-rt (ale-rt) <alessandro.pisa@gmail.com> | ||
| Commit: https://github.com/plone/Products.CMFPlone/commit/43daa120bbb7a826b19c3b2bcacc9b86557def4a | ||
| Commit: https://github.com/plone/plone.app.users/commit/083275393f3c14a5f9ce37613ba36521a4be03ae | ||
|
|
||
| Add the timezone property to the member properties | ||
| Added a timezone setter | ||
|
|
||
| Fixes #1290 | ||
| Add a timezone setter that prevents `None` to be stored as a timezone. | ||
| Save it as an empty string instead. | ||
|
|
||
| Files changed: | ||
| A news/1290.bugfix | ||
| M Products/CMFPlone/profiles/default/memberdata_properties.xml | ||
|
|
||
| b'diff --git a/Products/CMFPlone/profiles/default/memberdata_properties.xml b/Products/CMFPlone/profiles/default/memberdata_properties.xml\nindex 18098a8179..0dc2ac7ceb 100644\n--- a/Products/CMFPlone/profiles/default/memberdata_properties.xml\n+++ b/Products/CMFPlone/profiles/default/memberdata_properties.xml\n@@ -14,4 +14,5 @@\n <property name="ext_editor" type="boolean">False</property>\n <property name="wysiwyg_editor" type="string"></property>\n <property name="visible_ids" type="boolean">False</property>\n+ <property name="timezone" type="string"></property>\n </object>\ndiff --git a/news/1290.bugfix b/news/1290.bugfix\nnew file mode 100644\nindex 0000000000..cb082c4f98\n--- /dev/null\n+++ b/news/1290.bugfix\n@@ -0,0 +1 @@\n+Fixed an issue that prevented the user to select the preferred timezone\n' | ||
|
|
||
| Repository: Products.CMFPlone | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2022-08-25T17:25:16+02:00 | ||
| Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> | ||
| Commit: https://github.com/plone/Products.CMFPlone/commit/7113dfe56495cd6f165f7da53723aa30638d5507 | ||
|
|
||
| Merge branch 'master' into 1290.bugfix | ||
| Fixes #109 | ||
|
|
||
| Files changed: | ||
| A news/3599.bugfix | ||
| M Products/CMFPlone/controlpanel/browser/maintenance.pt | ||
| M Products/CMFPlone/controlpanel/browser/relations_inspect.pt | ||
| A news/109.bugfix | ||
| M plone/app/users/browser/account.py | ||
|
|
||
| b'diff --git a/Products/CMFPlone/controlpanel/browser/maintenance.pt b/Products/CMFPlone/controlpanel/browser/maintenance.pt\nindex 4c31999511..5440bff8fe 100644\n--- a/Products/CMFPlone/controlpanel/browser/maintenance.pt\n+++ b/Products/CMFPlone/controlpanel/browser/maintenance.pt\n@@ -28,13 +28,6 @@\n </metal:block>\n \n <header>\n- <a href=""\n- id="setup-link"\n- tal:attributes="href string:$portal_url/@@overview-controlpanel"\n- i18n:translate="">\n- Site Setup\n- </a>\n-\n <h1 class="documentFirstHeading"\n i18n:translate=""\n tal:condition="view/label"\ndiff --git a/Products/CMFPlone/controlpanel/browser/relations_inspect.pt b/Products/CMFPlone/controlpanel/browser/relations_inspect.pt\nindex c1601d78e0..e1187c5460 100644\n--- a/Products/CMFPlone/controlpanel/browser/relations_inspect.pt\n+++ b/Products/CMFPlone/controlpanel/browser/relations_inspect.pt\n@@ -13,12 +13,6 @@\n tal:define="inspect_backrelation python: view.inspect_backrelation;\n relation python: view.relation;">\n \n- <a id="setup-link" class="link-parent"\n- tal:attributes="href string:$portal_url/@@overview-controlpanel"\n- i18n:translate="">\n- Site Setup\n- </a>\n-\n <header>\n <h1 class="documentFirstHeading"\n tal:condition="python: not inspect_backrelation">\ndiff --git a/news/3599.bugfix b/news/3599.bugfix\nnew file mode 100644\nindex 0000000000..f3d4ac9158\n--- /dev/null\n+++ b/news/3599.bugfix\n@@ -0,0 +1,2 @@\n+Fixed \'Site Setup\' link appearing on various parts of Control Panel\n+[rohnsha0]\n' | ||
| b"diff --git a/news/109.bugfix b/news/109.bugfix\nnew file mode 100644\nindex 00000000..a7f6796f\n--- /dev/null\n+++ b/news/109.bugfix\n@@ -0,0 +1 @@\n+Ensure that, when no timezone is selected, the value of the stored timezone is an empty string\ndiff --git a/plone/app/users/browser/account.py b/plone/app/users/browser/account.py\nindex f89bac92..f13c085c 100644\n--- a/plone/app/users/browser/account.py\n+++ b/plone/app/users/browser/account.py\n@@ -138,6 +138,16 @@ def wysiwyg_editor(self, value):\n value = ''\n return self._setProperty('wysiwyg_editor', value)\n \n+ @property\n+ def timezone(self):\n+ return self._getProperty('timezone')\n+\n+ @timezone.setter\n+ def timezone(self, value):\n+ if value is None:\n+ value = ''\n+ return self._setProperty('timezone', value)\n+\n \n @implementer(IAccountPanelForm)\n class AccountPanelForm(AutoExtensibleForm, form.Form):\n" | ||
|
|
||
| Repository: Products.CMFPlone | ||
| Repository: plone.app.users | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2022-08-25T17:26:07+02:00 | ||
| Date: 2022-08-25T17:26:16+02:00 | ||
| Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> | ||
| Commit: https://github.com/plone/Products.CMFPlone/commit/6eec83f3f69100f6f7291e25504a4ffb5addff99 | ||
| Commit: https://github.com/plone/plone.app.users/commit/a1de9d77db592aad96591f5f3ebd2c5944c6fb17 | ||
|
|
||
| Merge pull request #3625 from plone/1290.bugfix | ||
| Merge pull request #110 from plone/109.bugfix | ||
|
|
||
| Add the timezone property to the member properties | ||
| Added a timezone setter | ||
|
|
||
| Files changed: | ||
| A news/1290.bugfix | ||
| M Products/CMFPlone/profiles/default/memberdata_properties.xml | ||
| A news/109.bugfix | ||
| M plone/app/users/browser/account.py | ||
|
|
||
| b'diff --git a/Products/CMFPlone/profiles/default/memberdata_properties.xml b/Products/CMFPlone/profiles/default/memberdata_properties.xml\nindex 18098a8179..0dc2ac7ceb 100644\n--- a/Products/CMFPlone/profiles/default/memberdata_properties.xml\n+++ b/Products/CMFPlone/profiles/default/memberdata_properties.xml\n@@ -14,4 +14,5 @@\n <property name="ext_editor" type="boolean">False</property>\n <property name="wysiwyg_editor" type="string"></property>\n <property name="visible_ids" type="boolean">False</property>\n+ <property name="timezone" type="string"></property>\n </object>\ndiff --git a/news/1290.bugfix b/news/1290.bugfix\nnew file mode 100644\nindex 0000000000..cb082c4f98\n--- /dev/null\n+++ b/news/1290.bugfix\n@@ -0,0 +1 @@\n+Fixed an issue that prevented the user to select the preferred timezone\n' | ||
| b"diff --git a/news/109.bugfix b/news/109.bugfix\nnew file mode 100644\nindex 00000000..a7f6796f\n--- /dev/null\n+++ b/news/109.bugfix\n@@ -0,0 +1 @@\n+Ensure that, when no timezone is selected, the value of the stored timezone is an empty string\ndiff --git a/plone/app/users/browser/account.py b/plone/app/users/browser/account.py\nindex f89bac92..f13c085c 100644\n--- a/plone/app/users/browser/account.py\n+++ b/plone/app/users/browser/account.py\n@@ -138,6 +138,16 @@ def wysiwyg_editor(self, value):\n value = ''\n return self._setProperty('wysiwyg_editor', value)\n \n+ @property\n+ def timezone(self):\n+ return self._getProperty('timezone')\n+\n+ @timezone.setter\n+ def timezone(self, value):\n+ if value is None:\n+ value = ''\n+ return self._setProperty('timezone', value)\n+\n \n @implementer(IAccountPanelForm)\n class AccountPanelForm(AutoExtensibleForm, form.Form):\n" | ||
|
|