Conjunto de mudanças 6493 no repositório publico

Timestamp:

13/06/2012 21:22:43 (9 anos atrás)

Autor:

mazza

Mensagem:

boxes: campo conteudo relacionado

Localização:

PortalInterlegis/produtos/il.portalinterlegis/trunk

Arquivos:

• inspecao.py (modificado) (1 diff)
• setup.py (modificado) (1 diff)
• src/il/portalinterlegis/browser/interfaces.py (modificado) (4 diffs)
• src/il/portalinterlegis/profiles/default/metadata.xml (modificado) (1 diff)
• src/il/portalinterlegis/tests/fixtures.py (modificado) (1 diff)
• src/il/portalinterlegis/tests/testintegration.py (modificado) (2 diffs)
• src/il/portalinterlegis/tests/testunitboxes.py (modificado) (1 diff)

PortalInterlegis/produtos/il.portalinterlegis/trunk/inspecao.py

@@ -11 +11 @@
 boxmanager = BoxManager(ISimpleBox)
 boxmanager.box_content(context, 1)
+
+from Testing.ZopeTestCase.utils import startZServer
+startZServer()
+
+with open("out", "w+") as f: f.write(browser.contents)

PortalInterlegis/produtos/il.portalinterlegis/trunk/setup.py

@@ -31 +31 @@
           'five.grok',
           'plone.app.theming',
-          'z3c.form',
           'plone.directives.form',
+          'plone.app.z3cform',
+          'plone.formwidget.contenttree',
+          'plone.formwidget.autocomplete',
       ],
       extras_require={'test': ['plone.app.testing', 'mock']},

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/browser/interfaces.py

@@ -3 +3 @@
 from plone.autoform.interfaces import WIDGETS_KEY
 from plone.directives import form
+from plone.formwidget.autocomplete import AutocompleteFieldWidget
+from plone.formwidget.contenttree import PathSourceBinder
 from zope import schema
 from zope.interface import Interface
@@ -18 +20 @@
 
 # decorator
-def with_widget(**kwargs):
+def rich(*args, **kwargs):
     def f(cls):
-        cls.setTaggedValue(WIDGETS_KEY, kwargs)
+        cls.setTaggedValue(WIDGETS_KEY,
+                           dict([(k, WysiwygFieldWidget) for k in args],
+                                **kwargs))
         return cls
     return f
@@ -50 +54 @@
 # BOX INTERFACES
 
-
 @template('''
       <div class="simple-box">
-        <h2>%(title)s</h2>
-        <h3 class="icon-news"><a href="">%(subtitle)s</a></h3>
-        <p>
-          %(text)s
-        </p>
+        <a href="/portal/%(target)s">
+          <h2>%(title)s</h2>
+          <h3 class="icon-news">%(subtitle)s</h3>
+          <p>
+            %(text)s
+          </p>
+        </a>
       </div>''')
-@with_widget(text=WysiwygFieldWidget)
+@rich('text', target=AutocompleteFieldWidget)
 class ISimpleBox(form.Schema):
     title = schema.TextLine(title=u"Título", required=True)
     subtitle = schema.TextLine(title=u"Subtítulo", required=True)
     text = schema.Text(title=u"Texto", required=False)
+    target = schema.Choice(title=u"Conteúdo relacionado",
+                            source=PathSourceBinder(),
+                            required=False)
 
 @template('''
@@ -108 +116 @@
           </div>
 ''')
+@rich('text', target=AutocompleteFieldWidget)
 class ICarousel(Interface):
-    pass
+    title = schema.TextLine(title=u"Título", required=True)
+    text = schema.Text(title=u"Texto", required=False)
+    target = schema.Choice(title=u"Conteúdo relacionado",
+                           source=PathSourceBinder(portal_type='Document'))
 
 @template('''

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/profiles/default/metadata.xml

@@ -4 +4 @@
   <dependencies>
     <dependency>profile-plone.app.theming:default</dependency>
+    <dependency>profile-plone.formwidget.contenttree:default</dependency>
+    <dependency>profile-plone.formwidget.autocomplete:default</dependency>
   </dependencies>
 </metadata>

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/tests/fixtures.py

@@ -34 +34 @@
         import il.portalinterlegis
         xmlconfig.file('configure.zcml',
+                       plone.formwidget.contenttree,
+                       context=configurationContext)
+        import il.portalinterlegis
+        xmlconfig.file('configure.zcml',
                        il.portalinterlegis,
                        context=configurationContext)

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/tests/testintegration.py

@@ -79 +79 @@
         boxmanager = BoxManager(ISimpleBox)
 
-        def use_box_form(title, subtitle, text, num):
+        def use_box_form(title, subtitle, text, target, num):
             browser = self.layer.manager_browser()
             browser.open(self.url(boxmanager._box_name_for_url(num)))
@@ -85 +85 @@
             browser.getControl(name='form.widgets.subtitle').value = subtitle
             browser.getControl(name='form.widgets.text').value = text
+            # TODO: nao sei como testar um AutocompleteFieldWidget com o zope.testbrowser (tem javascript)
+            # browser.getControl(label=u'Conteúdo relacionado').value = target
             browser.getControl(name='form.buttons.apply').click()
 
-        use_box_form('TIT_1', 'SUBTIT_1', 'TEXT_1', 1)
-        use_box_form('TIT_2', 'SUBTIT_2', 'TEXT_2', 2)
-        self.assertEqual({'title': 'TIT_1', 'subtitle': 'SUBTIT_1', 'text': 'TEXT_1'},
+        use_box_form('TIT_1', 'SUBTIT_1', 'TEXT_1', 'ALVO_1', 1)
+        use_box_form('TIT_2', 'SUBTIT_2', 'TEXT_2', 'ALVO_2', 2)
+        self.assertEqual({'title': 'TIT_1', 'subtitle': 'SUBTIT_1', 'text': 'TEXT_1', 'target': None},
                          boxmanager.box_content(context, 1))
-        self.assertEqual({'title': 'TIT_2', 'subtitle': 'SUBTIT_2', 'text': 'TEXT_2'},
+        self.assertEqual({'title': 'TIT_2', 'subtitle': 'SUBTIT_2', 'text': 'TEXT_2', 'target': None},
                          boxmanager.box_content(context, 2))
 

PortalInterlegis/produtos/il.portalinterlegis/trunk/src/il/portalinterlegis/tests/testunitboxes.py

@@ -24 +24 @@
     def test_html(self):
         with patch.object(BoxManager, 'box_content') as mock:
-            mock.return_value = {'title': 'TIT_1', 'subtitle': 'SUBTIT_1', 'text': 'TEXT_1'}
+            mock.return_value = {'title': 'TIT_1', 'subtitle': 'SUBTIT_1', 'text': 'TEXT_1', 'target': 'alvo'}
 
             boxmanager = BoxManager(ISimpleBox)
             self.assertEqual('''
       <div class="simple-box">
-        <h2>TIT_1</h2>
-        <h3 class="icon-news"><a href="">SUBTIT_1</a></h3>
-        <p>
-          TEXT_1
-        </p>
+        <a href="/portal/alvo">
+          <h2>TIT_1</h2>
+          <h3 class="icon-news">SUBTIT_1</h3>
+          <p>
+            TEXT_1
+          </p>
+        </a>
       </div>
         ''', boxmanager.html(_, _))