r13719 - in MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget: . profiles/default tests
"Hanno Schlichting" <[email protected]> Wed, 13 Jul 2011 10:00:27 +0000
| Newsgroups | gmane.comp.web.zope.plone.archetypes.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: hannosch
Date: Wed Jul 13 10:00:25 2011
New Revision: 13719
Removed:
MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/skins.zcml
Modified:
MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/configure.zcml
MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/field.py
MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/profiles/default/metadata.xml
MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/tests/base.py
MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/tests/integration.txt
MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/tests/test_integration_doctest.py
MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/widget.py
Log:
More cleanup
Modified: MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/configure.zcml
==============================================================================
--- MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/configure.zcml (original)
+++ MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/configure.zcml Wed Jul 13 10:00:25 2011
@@ -1,14 +1,13 @@
<configure
xmlns="http://namespaces.zope.org/zope"
- xmlns:five="http://namespaces.zope.org/five"
- xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
xmlns:cmf="http://namespaces.zope.org/cmf"
+ xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
xmlns:browser="http://namespaces.zope.org/browser"
i18n_domain="plone">
<include package="plone.app.querystring" />
- <include file="skins.zcml" />
+ <cmf:registerDirectory name="querywidget" />
<genericsetup:registerProfile
name="default"
Modified: MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/field.py
==============================================================================
--- MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/field.py (original)
+++ MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/field.py Wed Jul 13 10:00:25 2011
@@ -1,27 +1,21 @@
-"""
- QueryField field class
-"""
-
-from __future__ import nested_scopes
-
from AccessControl import ClassSecurityInfo
+from archetypes.querywidget.interfaces import IQueryField
from Products.Archetypes.Field import ObjectField
from Products.Archetypes.Field import registerField
-from archetypes.querywidget.interfaces import IQueryField
from zope.interface import implements
-from zope.app.component.hooks import getSite
+from zope.site.hooks import getSite
from plone.app.querystring.querybuilder import QueryBuilder
class QueryField(ObjectField):
"""QueryField for storing query"""
+
implements(IQueryField)
_properties = ObjectField._properties.copy()
security = ClassSecurityInfo()
- # -*- Your ATSchema to Python Property Bridges Here ... -*-
def get(self, instance, **kwargs):
"""Get the query dict from the request or from the object"""
raw = kwargs.get('raw', None)
@@ -32,12 +26,12 @@
querybuilder = QueryBuilder(instance, getSite().REQUEST)
sort_order = 'reverse' if instance.getSort_reversed() else 'ascending'
- return querybuilder(query=value, sort_on=instance.getSort_on(), sort_order=sort_order)
+ return querybuilder(query=value,
+ sort_on=instance.getSort_on(), sort_order=sort_order)
def getRaw(self, instance, **kwargs):
return ObjectField.get(self, instance, **kwargs) or ()
-registerField(QueryField,
- title='QueryField',
- description=('query field for storing a query'))
+registerField(QueryField, title='QueryField',
+ description=('query field for storing a query'))
Modified: MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/profiles/default/metadata.xml
==============================================================================
--- MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/profiles/default/metadata.xml (original)
+++ MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/profiles/default/metadata.xml Wed Jul 13 10:00:25 2011
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<metadata>
- <version>0.1</version>
+ <version>1</version>
<dependencies>
<dependency>profile-plone.app.querystring:default</dependency>
</dependencies>
Modified: MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/tests/base.py
==============================================================================
--- MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/tests/base.py (original)
+++ MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/tests/base.py Wed Jul 13 10:00:25 2011
@@ -1,18 +1,18 @@
import unittest2 as unittest
-from plone.app.testing import PloneSandboxLayer
-from plone.app.testing import PLONE_FIXTURE
+
from plone.app.testing import applyProfile
from plone.app.testing import login
-from zope.configuration import xmlconfig
+from plone.app.testing import PloneSandboxLayer
+from plone.app.testing import PLONE_FIXTURE
from plone.app.testing.layers import IntegrationTesting
from plone.testing import z2
+from zope.configuration import xmlconfig
class ArchetypesQueryWidgetLayer(PloneSandboxLayer):
defaultBases = (PLONE_FIXTURE,)
def setUpZope(self, app, configurationContext):
- # load ZCML
import archetypes.querywidget
xmlconfig.file('configure.zcml', archetypes.querywidget,
context=configurationContext)
@@ -23,12 +23,7 @@
z2.installProduct(app, 'plone.app.collection')
def setUpPloneSite(self, portal):
- # install into the Plone site
applyProfile(portal, 'plone.app.collection:default')
-
- # create admin user
- # z2.setRoles(portal, TEST_USER_NAME, ['Manager']) does not work
- # setRoles(portal, TEST_USER_NAME, ['Manager']) is not working either
portal.acl_users.userFolderAddUser('admin',
'secret',
['Manager'],
@@ -37,7 +32,7 @@
# enable workflow for browser tests
workflow = portal.portal_workflow
- workflow.setDefaultChain('plone_workflow')
+ workflow.setDefaultChain('simple_publication_workflow')
# add a page, so we can test with it
portal.invokeFactory("Document",
Modified: MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/tests/integration.txt
==============================================================================
--- MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/tests/integration.txt (original)
+++ MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/tests/integration.txt Wed Jul 13 10:00:25 2011
@@ -1,7 +1,8 @@
archetypes.querywidget
======================
-This package containts the archetypes field and widget used in plone.app.collection
-to select the search criteria of the collection.
+
+This package contains the archetypes field and widget used in
+plone.app.collection to select the search criteria of the collection.
First login as portal owner
Modified: MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/tests/test_integration_doctest.py
==============================================================================
--- MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/tests/test_integration_doctest.py (original)
+++ MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/tests/test_integration_doctest.py Wed Jul 13 10:00:25 2011
@@ -1,9 +1,9 @@
-import unittest
import doctest
+import unittest
from Testing import ZopeTestCase as ztc
-import base
+from archetypes.querywidget.tests import base
def test_suite():
@@ -12,7 +12,5 @@
ztc.ZopeDocFileSuite(
'tests/integration.txt', package='archetypes.querywidget',
test_class=base.ArchetypesQueryWidgetTestCase,
- optionflags=doctest.REPORT_ONLY_FIRST_FAILURE |
- doctest.NORMALIZE_WHITESPACE |
- doctest.ELLIPSIS),
+ optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS),
])
Modified: MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/widget.py
==============================================================================
--- MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/widget.py (original)
+++ MoreFieldsAndWidgets/archetypes.querywidget/trunk/archetypes/querywidget/widget.py Wed Jul 13 10:00:25 2011
@@ -1,20 +1,14 @@
-"""
- Query Widget
-"""
-
from AccessControl import ClassSecurityInfo
+from plone.registry.interfaces import IRegistry
from Products.Archetypes.Widget import TypesWidget
from Products.Archetypes.Registry import registerWidget
from zope.component import getMultiAdapter
-
-from plone.registry.interfaces import IRegistry
from zope.component import getUtility
from plone.app.querystring.interfaces import IQuerystringRegistryReader
class QueryWidget(TypesWidget):
- """QueryWidget"""
_properties = TypesWidget._properties.copy()
_properties.update({
@@ -26,7 +20,6 @@
security = ClassSecurityInfo()
security.declarePublic('process_form')
-
def process_form(self, instance, field, form, empty_marker=None,
emptyReturnsMarker=False, validating=True):
"""A custom implementation for the widget form processing."""
@@ -68,9 +61,8 @@
name='display_query_results')(**options)
-__all__ = ('QueryWidget')
+registerWidget(QueryWidget, title='Query',
+ description=('Field for storing a query'),
+ used_for=('archetypes.querywidget.QueryField',))
-registerWidget(QueryWidget,
- title='Query',
- description=('Field for storing a query'),
- used_for=('archetypes.querywidget.QueryField',))
+__all__ = ('QueryWidget', )
------------------------------------------------------------------------------
AppSumo Presents a FREE Video for the SourceForge Community by Eric
Ries, the creator of the Lean Startup Methodology on "Lean Startup
Secrets Revealed." This video shows you how to validate your ideas,
optimize your ideas and identify your business strategy.
http://p.sf.net/sfu/appsumosfdev2dev