cone.tokens 0.3__py3-none-any.whl → 0.4__py3-none-any.whl

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/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/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.dist-info → cone.tokens-0.4.dist-info}/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.dist-info → cone.tokens-0.4.dist-info}/METADATA

@@ -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
@@ -170,6 +170,13 @@ Contributors
 Changes
 =======
 
+0.4 (2024-02-12)
+----------------
+
+- Adopt Settings UI changes from ``cone.app``.
+  [rnix]
+
+
 0.3 (2023-09-28)
 ----------------
 
@@ -199,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.dist-info → cone.tokens-0.4.dist-info}/RECORD

@@ -1,12 +1,12 @@
-cone.tokens-0.3-py3.9-nspkg.pth,sha256=tEwDlOTmXaVzEYEwdjzSJZOPcSTLyLlgxUtQPF_riIg,529
+cone.tokens-0.4-py3.9-nspkg.pth,sha256=tEwDlOTmXaVzEYEwdjzSJZOPcSTLyLlgxUtQPF_riIg,529
 cone/tokens/__init__.py,sha256=zyMjzaxhYp4B_D3GAUhK4zjjBtEYOizTSbsekNSHoSY,1167
 cone/tokens/api.py,sha256=HuLOcdOSKiXQ8lk5CorLQb1ed63A1ve7ykhZ0_6K220,6103
 cone/tokens/exceptions.py,sha256=5p8mm8yTjzKP-w_yrIFOR1R1SSDALtrNKN7vSm2zmlc,1335
 cone/tokens/model.py,sha256=SFs6D4sUiZL95o0nL9b1gab2Ovk05FG8Qb9Wjr-oL2M,3110
-cone/tokens/settings.py,sha256=P2bATFl8qeU5al1E_0xtzwvKbLXdtHCn6p1XLobKICo,1566
+cone/tokens/settings.py,sha256=6quBdZHMh5-iNIjZTdwW9mxVx7tZ5xsW4gHCEjjGMws,1823
 cone/tokens/browser/__init__.py,sha256=OxxOEK6olx5PbsvGYEo-eosjhwx2dwoEQCWHHktHiyw,780
 cone/tokens/browser/api.py,sha256=qWQlqwuZdCI4AouNOFtfl7WFv2ixVHxgfTM2cXnbfxg,6247
-cone/tokens/browser/settings.py,sha256=qZOD0ygqHehznczR_znnOjUSmGSJj7ugHDrk0YUBZfE,7549
+cone/tokens/browser/settings.py,sha256=5c-8G7qNm6wQmpXOPQ1pjGx8ofDldyXJsDtLZZL226A,6893
 cone/tokens/browser/token.py,sha256=cjijqXRKQWExbot46Q7FgPkmQrz8MLxiA4ISTS-z6ew,8236
 cone/tokens/browser/tokens.py,sha256=6PZffApbxYep4EU-_D7WlavzIRmJnqLhj44L9RhqTfA,3102
 cone/tokens/browser/static/cone.tokens.css,sha256=RNJyoITtuJciWos3FZ_K8AEptLZaFYWPUt1ScNk8ZOw,1776
@@ -14,7 +14,6 @@ cone/tokens/browser/static/cone.tokens.js,sha256=-hxFs_FER7TmqXzszJs73tBtAmFl6ZB
 cone/tokens/browser/static/cone.tokens.min.css,sha256=E_utr2JrZmDdfLKhsBHnPG34ydmBDWDVr4mXW_8HVpI,1413
 cone/tokens/browser/static/cone.tokens.min.js,sha256=esvMwhPyH0NOSIx3fGb0Lb5spV9TbYMxbTYN0KkQW8U,6255
 cone/tokens/browser/templates/token.pt,sha256=TsNbMXpheUgF1pdQejRlAe8AhdchSEAzq5Fg3C_aj90,4645
-cone/tokens/browser/templates/token_settings.pt,sha256=Hnd5xMyYKO-C0YPns_uJXRXjXUXGuNiAE-mULCCc4js,332
 cone/tokens/browser/templates/tokens.pt,sha256=ebkyuTXw0zE1VMoR23CxrM0iLTWnojYn3mVM9GhKlH4,530
 cone/tokens/browser/templates/tokens_overview.pt,sha256=3UuaNmRYCITc9tcV0XYHY4BGhs75V2BQ1rAsbMX2J04,2523
 cone/tokens/locale/cone.tokens.pot,sha256=99jS4QV1rBvdAM9AzuQsRISWDDnc2127Vn1bAbnxCOY,5735
@@ -26,11 +25,11 @@ cone/tokens/tests/__init__.py,sha256=hWn9DVVxs4NRrUkWdq2zfXXAXmj7jLOPV-rMVOhs9QA
 cone/tokens/tests/test_api.py,sha256=0NVXa7-uxbuo7R9gj4LImu1NnbqfEh4P2ARcuL9FqwU,11826
 cone/tokens/tests/test_json_api.py,sha256=PTkrFoQM7multWEfg483xUO8M34Lx9u3oMhJiFxbrcg,18033
 cone/tokens/tests/test_model.py,sha256=RIeTjsTNcdNs5_hJU87PwKBcJWb8oRNzvml234b6knk,3142
-cone/tokens/tests/test_settings.py,sha256=LxbMLPNTqxGivflPGSXhnBagclndqZ-r5nyuAH9eDs8,4466
+cone/tokens/tests/test_settings.py,sha256=EuKLvMCsVS24HiY3VbQpXHD1Hy38kOGOk06Z4pjODb4,4571
 cone/tokens/tests/test_token.py,sha256=-OqGUZaxS5Mr0ktr60OFd7IoN2tfZBWbqU5OY3Cqufo,12330
-cone.tokens-0.3.dist-info/LICENSE.rst,sha256=4ypqNr8TV5wKYK82pUnE5jcSNpnmtJsbeae2LmbqwG8,1092
-cone.tokens-0.3.dist-info/METADATA,sha256=qFBdGmTeMNawW-hkYpKbE1pwR3wEbToZOBCw_bkGbk4,6005
-cone.tokens-0.3.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-cone.tokens-0.3.dist-info/namespace_packages.txt,sha256=lu11VEz--UhjAtw-HG4CejJNFf-TZlq7z1O6wZ7Vrjk,5
-cone.tokens-0.3.dist-info/top_level.txt,sha256=lu11VEz--UhjAtw-HG4CejJNFf-TZlq7z1O6wZ7Vrjk,5
-cone.tokens-0.3.dist-info/RECORD,,
+cone.tokens-0.4.dist-info/LICENSE.rst,sha256=2wjEkWGup1L6Q9Sizmf9d4vzh2Y6Vq2Wrg5JH_hPh4c,1097
+cone.tokens-0.4.dist-info/METADATA,sha256=q9YBNBHNwPgb3eNGfwZve1qE8RB-eh3lI8tI6JH8jiY,6103
+cone.tokens-0.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+cone.tokens-0.4.dist-info/namespace_packages.txt,sha256=lu11VEz--UhjAtw-HG4CejJNFf-TZlq7z1O6wZ7Vrjk,5
+cone.tokens-0.4.dist-info/top_level.txt,sha256=lu11VEz--UhjAtw-HG4CejJNFf-TZlq7z1O6wZ7Vrjk,5
+cone.tokens-0.4.dist-info/RECORD,,

{cone.tokens-0.3.dist-info → cone.tokens-0.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.40.0)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

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>