cone.tokens 0.3__tar.gz → 0.4__tar.gz

{cone.tokens-0.3 → cone.tokens-0.4}/CHANGES.rst

@@ -1,6 +1,13 @@
 Changes
 =======
 
+0.4 (2024-02-12)
+----------------
+
+- Adopt Settings UI changes from ``cone.app``.
+  [rnix]
+
+
 0.3 (2023-09-28)
 ----------------
 

{cone.tokens-0.3 → cone.tokens-0.4}/LICENSE.rst

@@ -3,7 +3,7 @@ License
 
 MIT License
 
-Copyright (c) 2023, Cone Contributors
+Copyright (c) 2023-2024, Cone Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{cone.tokens-0.3/src/cone.tokens.egg-info → cone.tokens-0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cone.tokens
-Version: 0.3
+Version: 0.4
 Summary: cone token api
 Home-page: http://github.com/conestack/cone.tokens
 Author: Cone Contributors
@@ -10,8 +10,13 @@ Keywords: node pyramid cone web
 Classifier: Environment :: Web Environment
 Classifier: Programming Language :: Python
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
-Provides-Extra: test
 License-File: LICENSE.rst
+Requires-Dist: setuptools
+Requires-Dist: cone.sql
+Requires-Dist: python-dateutil
+Requires-Dist: qrcode[pil]
+Provides-Extra: test
+Requires-Dist: zope.testrunner; extra == "test"
 
 .. image:: https://img.shields.io/pypi/v/cone.tokens.svg
     :target: https://pypi.python.org/pypi/cone.tokens
@@ -165,6 +170,13 @@ Contributors
 Changes
 =======
 
+0.4 (2024-02-12)
+----------------
+
+- Adopt Settings UI changes from ``cone.app``.
+  [rnix]
+
+
 0.3 (2023-09-28)
 ----------------
 
@@ -194,7 +206,7 @@ License
 
 MIT License
 
-Copyright (c) 2023, Cone Contributors
+Copyright (c) 2023-2024, Cone Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{cone.tokens-0.3 → cone.tokens-0.4}/setup.py

@@ -9,7 +9,7 @@ def read_file(name):
         return f.read()
 
 
-version = '0.3'
+version = '0.4'
 shortdesc = 'cone token api'
 longdesc = '\n\n'.join([read_file(name) for name in [
     'README.rst',

{cone.tokens-0.3 → cone.tokens-0.4}/src/cone/tokens/browser/settings.py

@@ -1,9 +1,7 @@
-from cone.app.browser.authoring import ContentEditForm
 from cone.app.browser.form import Form
-from cone.app.browser.layout import ProtectedContentTile
-from cone.app.browser.settings import SettingsBehavior
+from cone.app.browser.settings import SettingsForm
+from cone.app.browser.settings import settings_form
 from cone.app.browser.utils import make_url
-from cone.tile import tile
 from cone.tokens.settings import TokenSettings
 from cone.tokens.settings import tokens_config
 from plumber import plumbing
@@ -19,26 +17,10 @@ import json
 _ = TranslationStringFactory('cone.ugm')
 
 
-@tile(
-    name='content',
-    path='templates/token_settings.pt',
-    interface=TokenSettings,
-    permission='manage')
-class TokenSettingsContent(ProtectedContentTile):
-    pass
-
-
-@tile(name='editform', interface=TokenSettings, permission='edit')
-@plumbing(SettingsBehavior, ContentEditForm)
+@settings_form(TokenSettings)
+@plumbing(SettingsForm)
 class TokenSettingsForm(Form):
-    action_resource = u'edit'
     form_name = 'tokensettingsform'
-    show_contextmenu = False
-    form_heading = _('token_settings', default='Token Settings')
-
-    @property
-    def message_factory(self):
-        return _
 
     def timerange_extractor(self, widget, data):
         start = data.extracted['start']
@@ -173,7 +155,10 @@ class TokenSettingsForm(Form):
             props={
                 'datatype': int,
                 'min': 0,
-                'required': _('default_locktime_required', default='Default Locktime is required.'),
+                'required': _(
+                    'default_locktime_required',
+                    default='Default Locktime is required.'
+                ),
                 'label': _('default_locktime', default='Default Locktime')
             })
         form['default_usage_count'] = factory(
@@ -182,7 +167,10 @@ class TokenSettingsForm(Form):
             props={
                 'datatype': int,
                 'min': -1,
-                'required': _('default_usage_count_required', default='Default number of uses required.'),
+                'required': _(
+                    'default_usage_count_required',
+                    default='Default number of uses required.'
+                ),
                 'label': _('default_usage_count', default='Default Uses')
             })
         form['save'] = factory(
@@ -193,16 +181,7 @@ class TokenSettingsForm(Form):
                 'handler': self.save,
                 'next': self.next,
                 'label': 'Save'
-        })
-        form['cancel'] = factory(
-            'submit',
-            props={
-                'action': 'cancel',
-                'expression': True,
-                'skip': True,
-                'next': self.next,
-                'label': 'Cancel'
-        })
+            })
 
     def save(self, widget, data):
         def fetch(name):

{cone.tokens-0.3 → cone.tokens-0.4}/src/cone/tokens/settings.py

@@ -1,5 +1,6 @@
-from cone.app.model import BaseNode
 from cone.app.model import Metadata
+from cone.app.model import SettingsNode
+from cone.app.model import node_info
 from node.utils import instance_property
 from pyramid.i18n import TranslationStringFactory
 import json
@@ -34,7 +35,12 @@ default_token_settings = {
 }
 
 
-class TokenSettings(BaseNode):
+@node_info(
+    name='token_settings',
+    title=_('token_settings', default='Token Settings'),
+    description=_('token_settings_description', default='Token Settings'),
+    icon='glyphicon glyphicon-asterisk')
+class TokenSettings(SettingsNode):
 
     @property
     def attrs(self):

{cone.tokens-0.3 → cone.tokens-0.4}/src/cone/tokens/tests/test_settings.py

@@ -40,6 +40,7 @@ class TestSettings(NodeTestCase):
         self.assertEqual(attrs['morning']['start'], '09:00')
         self.assertEqual(attrs['default_locktime'], '2000')
 
+    @testing.principals(users={'admin': {}}, roles={'admin': ['manager']})
     @testing.temp_directory
     def test_BrowserSettingsForm(self, tempdir):
         tokens_config.config_file = os.path.join(tempdir, 'tokens.json')
@@ -49,7 +50,8 @@ class TestSettings(NodeTestCase):
         tile = TokenSettingsForm()
         tile.model = model
         tile.request = request
-        tile.prepare()
+        with self.layer.authenticated('admin'):
+            tile.prepare()
 
         form = tile.form
         self.assertEqual(form.keys(), [
@@ -59,7 +61,6 @@ class TestSettings(NodeTestCase):
             'default_locktime',
             'default_usage_count',
             'save',
-            'cancel',
             'came_from'
         ])
         self.assertEqual(form['morning'].keys(), ['start', 'end'])

{cone.tokens-0.3 → cone.tokens-0.4/src/cone.tokens.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cone.tokens
-Version: 0.3
+Version: 0.4
 Summary: cone token api
 Home-page: http://github.com/conestack/cone.tokens
 Author: Cone Contributors
@@ -10,8 +10,13 @@ Keywords: node pyramid cone web
 Classifier: Environment :: Web Environment
 Classifier: Programming Language :: Python
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
-Provides-Extra: test
 License-File: LICENSE.rst
+Requires-Dist: setuptools
+Requires-Dist: cone.sql
+Requires-Dist: python-dateutil
+Requires-Dist: qrcode[pil]
+Provides-Extra: test
+Requires-Dist: zope.testrunner; extra == "test"
 
 .. image:: https://img.shields.io/pypi/v/cone.tokens.svg
     :target: https://pypi.python.org/pypi/cone.tokens
@@ -165,6 +170,13 @@ Contributors
 Changes
 =======
 
+0.4 (2024-02-12)
+----------------
+
+- Adopt Settings UI changes from ``cone.app``.
+  [rnix]
+
+
 0.3 (2023-09-28)
 ----------------
 
@@ -194,7 +206,7 @@ License
 
 MIT License
 
-Copyright (c) 2023, Cone Contributors
+Copyright (c) 2023-2024, Cone Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{cone.tokens-0.3 → cone.tokens-0.4}/src/cone.tokens.egg-info/SOURCES.txt

@@ -27,7 +27,6 @@ src/cone/tokens/browser/static/cone.tokens.js
 src/cone/tokens/browser/static/cone.tokens.min.css
 src/cone/tokens/browser/static/cone.tokens.min.js
 src/cone/tokens/browser/templates/token.pt
-src/cone/tokens/browser/templates/token_settings.pt
 src/cone/tokens/browser/templates/tokens.pt
 src/cone/tokens/browser/templates/tokens_overview.pt
 src/cone/tokens/locale/cone.tokens.pot

cone.tokens-0.3/src/cone/tokens/browser/templates/token_settings.pt

@@ -1,9 +0,0 @@
-<tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"
-           xmlns:ajax="http://namespaces.conestack.org/ajax"
-           xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-           i18n:domain="cone.tokens"
-           omit-tag="True">
-  <div>
-    <tal:settings replace="structure tile('editform')" />
-  </div>
-</tal:block>