Author: jmorliaguet
Date: Wed Jun 28 13:58:07 2006
New Revision: 3536
Modified:
cpsskins/branches/paris-sprint-2006/locations/configure.zcml
cpsskins/branches/paris-sprint-2006/setup/io/adapters.py
cpsskins/branches/paris-sprint-2006/setup/io/utils.py
cpsskins/branches/paris-sprint-2006/storage/configure.zcml
Log:
- fixed the export of locations
Modified: cpsskins/branches/paris-sprint-2006/locations/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/locations/configure.zcml
(original)
+++ cpsskins/branches/paris-sprint-2006/locations/configure.zcml Wed Jun
28 13:58:07 2006
@@ -16,6 +16,13 @@
</class>
+ <!-- factory -->
+ <utility
+ name="cpsskins.location"
+ component="cpsskins.locations.location.Location"
+ provides="zope.component.interfaces.IFactory"
+ />
+
<utility
provides="zope.schema.interfaces.IVocabularyFactory"
component=".interfaces.ScopesVocabulary"
@@ -31,6 +38,11 @@
<!-- Typing -->
<interface
interface=".interfaces.ILocation"
+ type="cpsskins.elements.interfaces.IElementType"
+ />
+
+ <interface
+ interface=".interfaces.ILocation"
type="cpsskins.setup.interfaces.IResourceType"
/>
Modified: cpsskins/branches/paris-sprint-2006/setup/io/adapters.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/setup/io/adapters.py (original)
+++ cpsskins/branches/paris-sprint-2006/setup/io/adapters.py Wed Jun 28
13:58:07 2006
@@ -101,8 +101,11 @@
document = self.document
type = IType(context)
+ resourcename = type.resourcename
+ if not resourcename:
+ raise TypeError("%s has no resource type" % repr(context))
- element_el = document.createElement(type.resourcename)
+ element_el = document.createElement(resourcename)
relatable = IRelatable(context, None)
if relatable is not None:
Modified: cpsskins/branches/paris-sprint-2006/setup/io/utils.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/setup/io/utils.py (original)
+++ cpsskins/branches/paris-sprint-2006/setup/io/utils.py Wed Jun 28
13:58:07 2006
@@ -160,7 +160,9 @@
continue
contentname = el.getAttribute('type') or el.tagName
- factory_name = u'cpsskins.%s.%s' % (typename, contentname)
+ factory_name = u'cpsskins.%s' % typename
+ if contentname != typename:
+ factory_name = u'%s.%s' % (factory_name, contentname)
obj = createObject(factory_name)
storage.add(obj)
Modified: cpsskins/branches/paris-sprint-2006/storage/configure.zcml
==============================================================================
--- cpsskins/branches/paris-sprint-2006/storage/configure.zcml (original)
+++ cpsskins/branches/paris-sprint-2006/storage/configure.zcml Wed Jun 28
13:58:07 2006
@@ -49,7 +49,7 @@
<!-- Location storage -->
<cpsskins:storage
- id="location"
+ id="locations"
title="Location storage"
description="A location storage contains local information about the
site"
class=".locations.LocationStorage"
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
