[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ - replaced 'getIcon' by 'getIconURL' calls
Yvo Schubbe
y.2009 at wcm-solutions.de
Tue Nov 17 12:55:13 EST 2009
Log message for revision 105764:
- replaced 'getIcon' by 'getIconURL' calls
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
UU Products.CMFDefault/trunk/Products/CMFDefault/Favorite.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/tests/test_ursa.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/ursa.py
U Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/catalog.xml
UU Products.CMFDefault/trunk/Products/CMFDefault/skins/werebear/main_template.pt
U Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/folder_contents.py
U Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/folder_rename_form.py
UU Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/getBatchItemInfos.py
U Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/index_html_utils.html
U Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/main_template.pt
UU Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/review.pt
U Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/search.py
U Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/setup_talkback_tree.py
UU Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Favorite.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt 2009-11-17 17:54:04 UTC (rev 105763)
+++ Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt 2009-11-17 17:55:12 UTC (rev 105764)
@@ -4,7 +4,9 @@
2.2.0-beta (unreleased)
-----------------------
+- Skins and browser views: Replaced 'getIcon' by 'getIconURL' calls.
+
2.2.0-alpha (2009-11-13)
------------------------
Modified: Products.CMFDefault/trunk/Products/CMFDefault/Favorite.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/Favorite.py 2009-11-17 17:54:04 UTC (rev 105763)
+++ Products.CMFDefault/trunk/Products/CMFDefault/Favorite.py 2009-11-17 17:55:12 UTC (rev 105764)
@@ -117,17 +117,17 @@
else:
return portal_url()
-
- security.declareProtected(View, 'getIcon')
- def getIcon(self, relative_to_portal=0):
+ security.declareProtected(View, 'getIconURL')
+ def getIconURL(self):
"""
Instead of a static icon, like for Link objects, we want
to display an icon based on what the Favorite links to.
"""
try:
- return self.getObject().getIcon(relative_to_portal)
- except:
- return 'p_/broken'
+ return self.getObject().getIconURL()
+ except KeyError:
+ utool = getToolByName(self, 'portal_url')
+ return '%s/p_/broken' % utool()
security.declareProtected(View, 'getObject')
def getObject(self):
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/Favorite.py
___________________________________________________________________
Modified: svn:keywords
- Author Date Id Revision
+ Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py 2009-11-17 17:54:04 UTC (rev 105763)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py 2009-11-17 17:55:12 UTC (rev 105764)
@@ -120,25 +120,25 @@
@decode
def listBatchItems(self):
batch_obj = self._getBatchObj()
- portal_url = self._getPortalURL()
items = []
for item in batch_obj:
item_description = item.Description()
- item_icon = item.getIcon(1)
item_title = item.Title()
item_type = remote_type = item.Type()
- if item_type == 'Favorite' and not item_icon == 'p_/broken':
- item = item.getObject()
- item_description = item_description or item.Description()
- item_title = item_title or item.Title()
- remote_type = item.Type()
+ if item_type == 'Favorite':
+ try:
+ item = item.getObject()
+ item_description = item_description or item.Description()
+ item_title = item_title or item.Title()
+ remote_type = item.Type()
+ except KeyError:
+ pass
is_file = remote_type in ('File', 'Image')
is_link = remote_type == 'Link'
items.append({'description': item_description,
'format': is_file and item.Format() or '',
- 'icon': item_icon and ('%s/%s' %
- (portal_url, item_icon)) or '',
+ 'icon': item.getIconURL(),
'size': is_file and ('%0.0f kb' %
(item.get_size() / 1024.0)) or '',
'title': item_title,
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/tests/test_ursa.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/tests/test_ursa.py 2009-11-17 17:54:04 UTC (rev 105763)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/tests/test_ursa.py 2009-11-17 17:55:12 UTC (rev 105764)
@@ -146,18 +146,18 @@
view.context.getId = lambda: 'X' * 20
self.assertEqual(view.trunc_id, 'X' * 15 + '...')
- def test_icon_wo_getIcon_w_icon(self):
+ def test_icon_wo_getIconURL_w_icon(self):
view = self._makeOne()
- view.context.getIcon = lambda: 'ICON'
+ view.context.getIconURL = lambda: 'ICON'
view.context.icon = 'ICON2'
self.assertEqual(view.icon, 'ICON')
- def test_icon_wo_getIcon_w_icon(self):
+ def test_icon_wo_getIconURL_w_icon(self):
view = self._makeOne()
view.context.icon = 'ICON'
self.assertEqual(view.icon, 'ICON')
- def test_icon_wo_getIcon_wo_icon(self):
+ def test_icon_wo_getIconURL_wo_icon(self):
view = self._makeOne()
self.assertEqual(view.icon, '')
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/tests/test_ursa.py
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/ursa.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/ursa.py 2009-11-17 17:54:04 UTC (rev 105763)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/ursa.py 2009-11-17 17:55:12 UTC (rev 105764)
@@ -80,7 +80,7 @@
@property
@memoize
def icon(self):
- return getattr(self.context, 'getIcon',
+ return getattr(self.context, 'getIconURL',
lambda: getattr(self.context, 'icon', ''))()
@property
@memoize
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/ursa.py
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/catalog.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/catalog.xml 2009-11-17 17:54:04 UTC (rev 105763)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/catalog.xml 2009-11-17 17:55:12 UTC (rev 105764)
@@ -78,7 +78,7 @@
<column value="created"/>
<column value="effective"/>
<column value="expires"/>
- <column value="getIcon"/>
+ <column value="getIconURL"/>
<column value="getId"/>
<column value="listCreators"/>
<column value="modified"/>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/skins/werebear/main_template.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/skins/werebear/main_template.pt 2009-11-17 17:54:04 UTC (rev 105763)
+++ Products.CMFDefault/trunk/Products/CMFDefault/skins/werebear/main_template.pt 2009-11-17 17:55:12 UTC (rev 105764)
@@ -132,15 +132,14 @@
<tr class="ContextActionsRow">
<td class="ActionTitle"
- tal:define="getIcon python: hasattr(context, 'getIcon') and context.getIcon();
- icon python: getIcon or getattr(context, 'icon', '');
+ tal:define="icon_url python: getattr(context, 'getIconURL', '');
typ python: getattr(context, 'Type', '');
objID python: context.truncID(context.getId(), size=15)">
- <img src="icon" align="left" title="Type" alt="[X]"
+ <img src="icon_url" align="left" title="Type" alt="[X]"
height="16" width="16"
- tal:condition="icon"
- tal:attributes="src string:${globals/portal_url}/${icon};
+ tal:condition="icon_url"
+ tal:attributes="src icon_url;
alt typ; "
i18n:attributes="alt" />
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/skins/werebear/main_template.pt
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/folder_contents.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/folder_contents.py 2009-11-17 17:54:04 UTC (rev 105763)
+++ Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/folder_contents.py 2009-11-17 17:55:12 UTC (rev 105764)
@@ -139,7 +139,6 @@
items = []
i = 1
for item in batch_obj:
- item_icon = item.getIcon(1)
item_id = item.getId()
item_position = key == 'position' and str(b_start + i) or '...'
i += 1
@@ -147,8 +146,7 @@
'object/view') )['url']
items.append( { 'checkbox': items_manage_allowed and
('cb_%s' % item_id) or '',
- 'icon': item_icon and
- ( '%s/%s' % (portal_url, item_icon) ) or '',
+ 'icon': item.getIconURL(),
'id': item_id,
'modified': item.ModificationDate(),
'position': item_position,
Modified: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/folder_rename_form.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/folder_rename_form.py 2009-11-17 17:54:04 UTC (rev 105763)
+++ Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/folder_rename_form.py 2009-11-17 17:55:12 UTC (rev 105764)
@@ -27,9 +27,7 @@
raw_items = [ item for item in raw_items if item.cb_isMoveable() ]
items = []
for item in raw_items:
- item_icon = item.getIcon(1)
- items.append( { 'icon': item_icon and
- ( '%s/%s' % (portal_url, item_icon) ) or '',
+ items.append( { 'icon': item.getIconURL(),
'id': item.getId(),
'title': item.Title(),
'type': item.Type() or None } )
Modified: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/getBatchItemInfos.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/getBatchItemInfos.py 2009-11-17 17:54:04 UTC (rev 105763)
+++ Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/getBatchItemInfos.py 2009-11-17 17:55:12 UTC (rev 105764)
@@ -2,34 +2,28 @@
##parameters=batch_obj
##title=
##
-from Products.CMFCore.utils import getToolByName
-
-utool = getToolByName(script, 'portal_url')
-portal_url = utool()
-
items = []
-
for item in batch_obj:
item_description = item.Description()
- item_icon = item.getIcon(1)
item_title = item.Title()
item_type = remote_type = item.Type()
- if item_type == 'Favorite' and not item_icon == 'p_/broken':
- item = item.getObject()
- item_description = item_description or item.Description()
- item_title = item_title or item.Title()
- remote_type = item.Type()
+ if item_type == 'Favorite':
+ try:
+ item = item.getObject()
+ item_description = item_description or item.Description()
+ item_title = item_title or item.Title()
+ remote_type = item.Type()
+ except KeyError:
+ pass
is_file = remote_type in ('File', 'Image')
is_link = remote_type == 'Link'
- items.append( { 'description': item_description,
- 'format': is_file and item.Format() or '',
- 'icon': item_icon and
- ( '%s/%s' % (portal_url, item_icon) ) or '',
- 'size': is_file and
- '%0.0f kb' % ( item.get_size() / 1024.0 ) or '',
- 'title': item_title,
- 'type': item_type,
- 'url': is_link and item.getRemoteUrl() or
- item.absolute_url() } )
-
+ items.append({'description': item_description,
+ 'format': is_file and item.Format() or '',
+ 'icon': item.getIconURL(),
+ 'size': is_file and ('%0.0f kb' %
+ (item.get_size() / 1024.0)) or '',
+ 'title': item_title,
+ 'type': item_type,
+ 'url': is_link and item.getRemoteUrl() or
+ item.absolute_url()})
return tuple(items)
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/getBatchItemInfos.py
___________________________________________________________________
Deleted: svn:keywords
- Author Date Id Revision
Modified: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/index_html_utils.html
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/index_html_utils.html 2009-11-17 17:54:04 UTC (rev 105763)
+++ Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/index_html_utils.html 2009-11-17 17:55:12 UTC (rev 105764)
@@ -31,9 +31,9 @@
<li tal:repeat="item items">
<a href="item_url" tal:attributes="href item/absolute_url"><img
align="middle" border="0"
- tal:attributes="src string:${item/portal_url}/${item/getIcon};
- alt string:${item/Type};
- title string:${item/Type}"
+ tal:attributes="src item/getIconURL;
+ alt item/Type;
+ title item/Type"
i18n:attributes="alt; title" /></a>
<a href="item_url" tal:attributes="href item/absolute_url"
tal:content="item/Title"> Title </a>
@@ -69,9 +69,9 @@
<li tal:repeat="item items">
<a href="item_url" tal:attributes="href item/absolute_url"><img
align="middle" border="0"
- tal:attributes="src string:${item/portal_url}/${item/getIcon};
- alt string:${item/Type};
- title string:${item/Type}"
+ tal:attributes="src item/getIconURL;
+ alt item/Type;
+ title item/Type"
i18n:attributes="alt; title" /></a>
<a href="item_url" tal:attributes="href item/absolute_url"
tal:content="item/Title"> Title </a>
@@ -105,9 +105,9 @@
<li tal:repeat="item items">
<a href="item_url" tal:attributes="href item/absolute_url"><img
align="middle" border="0"
- tal:attributes="src string:${item/portal_url}/${item/getIcon};
- alt string:${item/Type};
- title string:${item/Type}"
+ tal:attributes="src item/getIconURL;
+ alt item/Type;
+ title item/Type"
i18n:attributes="alt; title" /></a>
<a href="item_url" tal:attributes="href item/absolute_url"
tal:content="item/TitleOrId"> Title </a>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/main_template.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/main_template.pt 2009-11-17 17:54:04 UTC (rev 105763)
+++ Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/main_template.pt 2009-11-17 17:55:12 UTC (rev 105764)
@@ -159,15 +159,14 @@
<tr class="ContextActionsRow">
<td class="ActionTitle"
- tal:define="getIcon python: hasattr(context, 'getIcon') and context.getIcon();
- icon python: getIcon or getattr(context, 'icon', '');
+ tal:define="icon_url python: getattr(context, 'getIconURL', '');
typ python: getattr(context, 'Type', '');
objID python: context.truncID(context.getId(), size=15)">
- <img src="icon" align="left" title="Type" alt="[X]"
+ <img src="icon_url" align="left" title="Type" alt="[X]"
height="16" width="16"
- tal:condition="icon"
- tal:attributes="src string:${portal_url}/${icon};
+ tal:condition="icon_url"
+ tal:attributes="src icon_url;
alt typ; "
i18n:attributes="alt" />
Modified: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/review.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/review.pt 2009-11-17 17:54:04 UTC (rev 105763)
+++ Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/review.pt 2009-11-17 17:55:12 UTC (rev 105764)
@@ -36,11 +36,11 @@
tal:attributes="value objPath" />
</td>
<td>
- <span tal:condition="item/getIcon">
+ <span tal:condition="item/getIconURL">
<a href="url"
tal:attributes="href objURL"
><img border="0" src="icon" alt="Type" title="Type"
- tal:attributes="src string:${purl}/${item/getIcon};
+ tal:attributes="src item/getIconURL;
alt item/Type|nothing;
title item/Type|nothing;
" /></a>
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/review.pt
___________________________________________________________________
Deleted: svn:keywords
- Author Date Id Revision
Modified: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/search.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/search.py 2009-11-17 17:54:04 UTC (rev 105763)
+++ Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/search.py 2009-11-17 17:55:12 UTC (rev 105764)
@@ -35,7 +35,7 @@
batch_obj = Batch(items, 25, b_start, orphan=1)
items = [ {'description': item.Description,
- 'icon': item.getIcon,
+ 'icon': item.getIconURL,
'title': item.Title,
'type': item.Type,
'date': item.Date,
Modified: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/setup_talkback_tree.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/setup_talkback_tree.py 2009-11-17 17:54:04 UTC (rev 105763)
+++ Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/setup_talkback_tree.py 2009-11-17 17:55:12 UTC (rev 105764)
@@ -7,8 +7,6 @@
from Products.CMFDefault.utils import decode
mtool = getToolByName(script, 'portal_membership')
-utool = getToolByName(script, 'portal_url')
-portal_url = utool()
tm = SimpleTreeMaker('tb_tree')
def getKids(object):
@@ -24,7 +22,6 @@
for row in rows:
branch = row.branch()
item = row.object
- item_icon = item.getIcon(1)
item_url = item.absolute_url()
items.append({'tree_colspan': tree.height - row.depth,
'tree_icon': branch and branch['img'] or '',
@@ -35,8 +32,7 @@
'date': item.CreationDate(),
'delete_url': is_delete_allowed and \
('%s/discitem_delete' % item_url) or '',
- 'icon': item_icon and \
- ('%s/%s' % (portal_url, item_icon)) or '',
+ 'icon': item.getIconURL(),
'title': item.Title(),
'url': item_url})
Modified: Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Favorite.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Favorite.py 2009-11-17 17:54:04 UTC (rev 105763)
+++ Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Favorite.py 2009-11-17 17:55:12 UTC (rev 105764)
@@ -24,6 +24,7 @@
from Products.CMFCore.interfaces import ISiteRoot
from Products.CMFCore.testing import ConformsToContent
+from Products.CMFCore.tests.base.dummy import DummyContent
from Products.CMFCore.tests.base.dummy import DummySite
from Products.CMFCore.tests.base.dummy import DummyTool
@@ -44,6 +45,7 @@
sm.registerUtility(self.site, ISiteRoot)
self.site._setObject( 'portal_membership', DummyTool() )
self.site._setObject( 'portal_url', DummyTool() )
+ self.site._setObject( 'target', DummyContent() )
def tearDown(self):
cleanUp()
@@ -66,13 +68,14 @@
self.assertEqual( f.getId(), 'foo' )
self.assertEqual( f.Title(), '' )
self.assertEqual( f.Description(), '' )
- self.assertEqual( f.getRemoteUrl(), utool.root )
+ self.assertEqual( f.getRemoteUrl(), utool() )
self.assertEqual( f.getObject(), self.site )
- self.assertEqual( f.getIcon(), self.site.getIcon() )
- self.assertEqual( f.getIcon(1), self.site.getIcon(1) )
+ self.assertEqual( f.getIconURL(), self.site.getIconURL() )
+ self.assertEqual( f.icon(), self.site.icon() )
def test_CtorArgs( self ):
utool = self.site.portal_url
+ target = self.site.target
self.assertEqual( self._makeOne( 'foo'
, title='Title'
).Title(), 'Title' )
@@ -82,28 +85,30 @@
).Description(), 'Description' )
baz = self.site._setObject('foo',
- self._makeOne('baz', remote_url='portal_url'))
- self.assertEqual( baz.getObject(), utool )
- self.assertEqual( baz.getRemoteUrl()
- , '%s/portal_url' % utool.root )
- self.assertEqual( baz.getIcon(), utool.getIcon() )
+ self._makeOne('baz', remote_url='target'))
+ self.assertEqual( baz.getObject(), target )
+ self.assertEqual( baz.getRemoteUrl(), '%s/target' % utool() )
+ self.assertEqual( baz.getIconURL(), target.getIconURL() )
+ self.assertEqual( baz.icon(), target.icon() )
def test_edit( self ):
utool = self.site.portal_url
+ target = self.site.target
f = self.site._setObject('foo', self._makeOne('foo'))
- f.edit( 'portal_url' )
- self.assertEqual( f.getObject(), utool )
- self.assertEqual( f.getRemoteUrl()
- , '%s/portal_url' % utool.root )
- self.assertEqual( f.getIcon(), utool.getIcon() )
+ f.edit( 'target' )
+ self.assertEqual( f.getObject(), target )
+ self.assertEqual( f.getRemoteUrl(), '%s/target' % utool() )
+ self.assertEqual( f.getIconURL(), target.getIconURL() )
+ self.assertEqual( f.icon(), target.icon() )
def test_editEmpty( self ):
utool = self.site.portal_url
f = self.site._setObject('gnnn', self._makeOne('gnnn'))
f.edit( '' )
self.assertEqual( f.getObject(), self.site )
- self.assertEqual( f.getRemoteUrl(), utool.root )
- self.assertEqual( f.getIcon(), self.site.getIcon() )
+ self.assertEqual( f.getRemoteUrl(), utool() )
+ self.assertEqual( f.getIconURL(), self.site.getIconURL() )
+ self.assertEqual( f.icon(), self.site.icon() )
def test_suite():
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Favorite.py
___________________________________________________________________
Modified: svn:keywords
- Author Date Id Revision
+ Id
More information about the checkins
mailing list