Changeset 1361
- Timestamp:
- 08/19/08 18:19:21 (3 months ago)
- Files:
-
- pleiades.workspace/trunk (modified) (1 prop)
- pleiades.workspace/trunk/docs (modified) (1 prop)
- pleiades.workspace/trunk/pleiades (modified) (1 prop)
- pleiades.workspace/trunk/pleiades/workspace (modified) (1 prop)
- pleiades.workspace/trunk/pleiades/workspace/__init__.py (modified) (1 diff)
- pleiades.workspace/trunk/pleiades/workspace/browser (modified) (1 prop)
- pleiades.workspace/trunk/pleiades/workspace/content (modified) (1 prop)
- pleiades.workspace/trunk/pleiades/workspace/content/folder.py (modified) (1 diff)
- pleiades.workspace/trunk/pleiades/workspace/content/workspace.py (modified) (2 diffs)
- pleiades.workspace/trunk/pleiades/workspace/i18n.py (added)
- pleiades.workspace/trunk/pleiades/workspace/interfaces.py (modified) (1 diff)
- pleiades.workspace/trunk/pleiades/workspace/profiles (modified) (1 prop)
- pleiades.workspace/trunk/pleiades/workspace/profiles/default (modified) (1 prop)
- pleiades.workspace/trunk/pleiades/workspace/profiles/default/import_steps.xml (added)
- pleiades.workspace/trunk/pleiades/workspace/profiles/default/pleiades.workspace_various.txt (added)
- pleiades.workspace/trunk/pleiades/workspace/profiles/default/portal_atct.xml (added)
- pleiades.workspace/trunk/pleiades/workspace/profiles/default/types (modified) (1 prop)
- pleiades.workspace/trunk/pleiades/workspace/resource.py (added)
- pleiades.workspace/trunk/pleiades/workspace/setuphandlers.py (modified) (2 diffs)
- pleiades.workspace/trunk/pleiades/workspace/tests (modified) (1 prop)
- pleiades.workspace/trunk/pleiades/workspace/tests/workspaces.txt (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
pleiades.workspace/trunk
- Property svn:ignore set to
*.pyc
- Property svn:ignore set to
pleiades.workspace/trunk/docs
- Property svn:ignore set to
*.pyc
- Property svn:ignore set to
pleiades.workspace/trunk/pleiades
- Property svn:ignore set to
*.pyc
- Property svn:ignore set to
pleiades.workspace/trunk/pleiades/workspace
- Property svn:ignore set to
*.pyc
- Property svn:ignore set to
pleiades.workspace/trunk/pleiades/workspace/__init__.py
r1327 r1361 2 2 """ 3 3 4 from zope.i18nmessageid import MessageFactory 5 from pleiades.workspace import config 6 4 from pleiades.workspace import config, resource 5 from Products.CMFPlone.CatalogTool import registerIndexableAttribute 7 6 from Products.Archetypes import atapi 8 7 from Products.CMFCore import utils 9 8 10 # Define a message factory for when this product is internationalised. 11 # This will be imported with the special name "_" in most modules. Strings 12 # like _(u"message") will then be extracted by i18n tools for translation. 13 14 WorkspaceMessageFactory = MessageFactory('pleiades.workspace') 9 registerIndexableAttribute('pleiades_wsuids', resource.pleiades_wsuids_value) 15 10 16 11 def initialize(context): pleiades.workspace/trunk/pleiades/workspace/browser
- Property svn:ignore set to
*.pyc
- Property svn:ignore set to
pleiades.workspace/trunk/pleiades/workspace/content
- Property svn:ignore set to
*.pyc
- Property svn:ignore set to
pleiades.workspace/trunk/pleiades/workspace/content/folder.py
r1327 r1361 28 28 from pleiades.workspace.interfaces import IWorkspaceFolder 29 29 from pleiades.workspace.config import PROJECTNAME 30 from pleiades.workspace import WorkspaceMessageFactory as _30 from pleiades.workspace.i18n import WorkspaceMessageFactory as _ 31 31 32 32 from Products.PleiadesEntity.content.PlaceContainer import PlaceContainer pleiades.workspace/trunk/pleiades/workspace/content/workspace.py
r1359 r1361 17 17 from pleiades.workspace.interfaces import IWorkspace 18 18 from pleiades.workspace.config import PROJECTNAME 19 from pleiades.workspace import WorkspaceMessageFactory as _19 from pleiades.workspace.i18n import WorkspaceMessageFactory as _ 20 20 21 21 from Products.PleiadesEntity.content.PlaceContainer import PlaceContainer … … 85 85 def initTopic(self, oid, type): 86 86 topic = self[oid] 87 c = topic.addCriterion('pleiades_wsuids', 'ATS electionCriterion')87 c = topic.addCriterion('pleiades_wsuids', 'ATSimpleStringCriterion') 88 88 c.setValue(self.UID()) 89 89 c = topic.addCriterion('Type', 'ATPortalTypeCriterion') pleiades.workspace/trunk/pleiades/workspace/interfaces.py
r1355 r1361 1 1 from zope.interface import Interface, Attribute 2 2 from zope import schema 3 4 3 from zope.app.container.constraints import contains 5 4 6 from pleiades.workspace import WorkspaceMessageFactory as _5 from pleiades.workspace.i18n import WorkspaceMessageFactory as _ 7 6 8 7 pleiades.workspace/trunk/pleiades/workspace/profiles
- Property svn:ignore set to
*.pyc
- Property svn:ignore set to
pleiades.workspace/trunk/pleiades/workspace/profiles/default
- Property svn:ignore set to
*.pyc
- Property svn:ignore set to
pleiades.workspace/trunk/pleiades/workspace/profiles/default/types
- Property svn:ignore set to
*.pyc
- Property svn:ignore set to
pleiades.workspace/trunk/pleiades/workspace/setuphandlers.py
r1355 r1361 1 from zope.component.interfaces import ComponentLookupError2 1 from Products.CMFCore.utils import getToolByName 3 from Products.CMFPlone.CatalogTool import registerIndexableAttribute4 from pleiades.workspace.interfaces import IResource5 2 6 3 def setupVarious(context): … … 9 6 portal = context.getSite() 10 7 addToCatalog(portal) 11 12 def pleiades_wsids_value(object, portal, **kwargs):13 try:14 resource = IResource(object)15 return list(resource.wsuids)16 except (ComponentLookupError, TypeError, ValueError, KeyError):17 # The catalog expects AttributeErrors when a value can't be found18 raise AttributeError19 20 registerIndexableAttribute('pleiades_wsuids', pleiades_wsids_value)21 8 22 9 def addToCatalog(portal): pleiades.workspace/trunk/pleiades/workspace/tests
- Property svn:ignore set to
*.pyc
- Property svn:ignore set to
