[Erp5-report] r45624 nicolas - in /erp5/trunk/bt5/erp5_crm: SkinTemplateItem/portal_skins/e...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Apr 22 10:26:57 CEST 2011
Author: nicolas
Date: Fri Apr 22 10:26:57 2011
New Revision: 45624
URL: http://svn.erp5.org?rev=45624&view=rev
Log:
Fix ItemList helper scripts to call getCategoryRelativeUrl on Category documents and provide expected value.
Modified:
erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Campaign_getResourceItemList.xml
erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_getResourceItemList.xml
erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Meeting_getResourceItemList.xml
erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunity_getResourceItemList.xml
erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequest_getResourceItemList.xml
erp5/trunk/bt5/erp5_crm/bt/revision
Modified: erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Campaign_getResourceItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Campaign_getResourceItemList.xml?rev=45624&r1=45623&r2=45624&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Campaign_getResourceItemList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Campaign_getResourceItemList.xml [utf8] Fri Apr 22 10:26:57 2011
@@ -57,14 +57,20 @@ by ListField instances.\n
"""\n
from zExceptions import Unauthorized\n
from Products.ERP5Type.Cache import CachingMethod\n
+portal = context.getPortalObject()\n
\n
def getResourceItemList():\n
result = [(\'\', \'\')]\n
- url_list = context.portal_preferences.getPreferredCampaignResourceList()\n
+ url_list = portal.portal_preferences.getPreferredCampaignResourceList()\n
for url in url_list:\n
try:\n
- resource_value = context.getPortalObject().restrictedTraverse(url)\n
- result.append((resource_value.getTranslatedTitle(), resource_value.getRelativeUrl()))\n
+ resource_value = portal.restrictedTraverse(url, None)\n
+ if resource_value is not None:\n
+ if resource_value.getPortalType() == \'Category\':\n
+ category_relative_url = resource_value.getCategoryRelativeUrl()\n
+ else:\n
+ category_relative_url = resource_value.getRelativeUrl()\n
+ result.append((resource_value.getTranslatedTitle(), category_relative_url))\n
except Unauthorized:\n
pass\n
return result\n
Modified: erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_getResourceItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_getResourceItemList.xml?rev=45624&r1=45623&r2=45624&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_getResourceItemList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_getResourceItemList.xml [utf8] Fri Apr 22 10:26:57 2011
@@ -57,15 +57,20 @@ by ListField instances.\n
"""\n
from zExceptions import Unauthorized\n
from Products.ERP5Type.Cache import CachingMethod\n
+portal = context.getPortalObject()\n
\n
def getResourceItemList():\n
result = [(\'\', \'\')]\n
- url_list = context.portal_preferences.getPreferredEventResourceList()\n
+ url_list = portal.portal_preferences.getPreferredEventResourceList()\n
for url in url_list:\n
try:\n
- resource_value = context.getPortalObject().restrictedTraverse(url, None)\n
+ resource_value = portal.restrictedTraverse(url, None)\n
if resource_value is not None:\n
- result.append((resource_value.getTranslatedTitle(), resource_value.getRelativeUrl()))\n
+ if resource_value.getPortalType() == \'Category\':\n
+ category_relative_url = resource_value.getCategoryRelativeUrl()\n
+ else:\n
+ category_relative_url = resource_value.getRelativeUrl()\n
+ result.append((resource_value.getTranslatedTitle(), category_relative_url))\n
except Unauthorized:\n
pass\n
return result\n
@@ -73,7 +78,7 @@ def getResourceItemList():\n
getResourceItemList = CachingMethod(getResourceItemList, \n
id=(script.id, context.Localizer.get_selected_language()), \n
cache_factory=\'erp5_ui_long\')\n
- \n
+\n
return getResourceItemList()\n
</string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Meeting_getResourceItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Meeting_getResourceItemList.xml?rev=45624&r1=45623&r2=45624&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Meeting_getResourceItemList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Meeting_getResourceItemList.xml [utf8] Fri Apr 22 10:26:57 2011
@@ -57,14 +57,20 @@ by ListField instances.\n
"""\n
from zExceptions import Unauthorized\n
from Products.ERP5Type.Cache import CachingMethod\n
+portal = context.getPortalObject()\n
\n
def getResourceItemList():\n
result = [(\'\', \'\')]\n
- url_list = context.portal_preferences.getPreferredMeetingResourceList()\n
+ url_list = portal.portal_preferences.getPreferredMeetingResourceList()\n
for url in url_list:\n
try:\n
- resource_value = context.getPortalObject().restrictedTraverse(url)\n
- result.append((resource_value.getTranslatedTitle(), resource_value.getRelativeUrl()))\n
+ resource_value = portal.restrictedTraverse(url, None)\n
+ if resource_value is not None:\n
+ if resource_value.getPortalType() == \'Category\':\n
+ category_relative_url = resource_value.getCategoryRelativeUrl()\n
+ else:\n
+ category_relative_url = resource_value.getRelativeUrl()\n
+ result.append((resource_value.getTranslatedTitle(), category_relative_url))\n
except Unauthorized:\n
pass\n
return result\n
Modified: erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunity_getResourceItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunity_getResourceItemList.xml?rev=45624&r1=45623&r2=45624&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunity_getResourceItemList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SaleOpportunity_getResourceItemList.xml [utf8] Fri Apr 22 10:26:57 2011
@@ -57,14 +57,20 @@ by ListField instances.\n
"""\n
from zExceptions import Unauthorized\n
from Products.ERP5Type.Cache import CachingMethod\n
+portal = context.getPortalObject()\n
\n
def getResourceItemList():\n
result = [(\'\', \'\')]\n
- url_list = context.portal_preferences.getPreferredSaleOpportunityResourceList()\n
+ url_list = portal.portal_preferences.getPreferredSaleOpportunityResourceList()\n
for url in url_list:\n
try:\n
- resource_value = context.getPortalObject().restrictedTraverse(url)\n
- result.append((resource_value.getTranslatedTitle(), resource_value.getRelativeUrl()))\n
+ resource_value = portal.restrictedTraverse(url, None)\n
+ if resource_value is not None:\n
+ if resource_value.getPortalType() == \'Category\':\n
+ category_relative_url = resource_value.getCategoryRelativeUrl()\n
+ else:\n
+ category_relative_url = resource_value.getRelativeUrl()\n
+ result.append((resource_value.getTranslatedTitle(), category_relative_url))\n
except Unauthorized:\n
pass\n
return result\n
Modified: erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequest_getResourceItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequest_getResourceItemList.xml?rev=45624&r1=45623&r2=45624&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequest_getResourceItemList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SupportRequest_getResourceItemList.xml [utf8] Fri Apr 22 10:26:57 2011
@@ -57,14 +57,20 @@ by ListField instances.\n
"""\n
from zExceptions import Unauthorized\n
from Products.ERP5Type.Cache import CachingMethod\n
+portal = context.getPortalObject()\n
\n
def getResourceItemList():\n
result = [(\'\', \'\')]\n
- url_list = context.portal_preferences.getPreferredSupportRequestResourceList()\n
+ url_list = portal.portal_preferences.getPreferredSupportRequestResourceList()\n
for url in url_list:\n
try:\n
- resource_value = context.getPortalObject().restrictedTraverse(url)\n
- result.append((resource_value.getTranslatedTitle(), resource_value.getRelativeUrl()))\n
+ resource_value = portal.restrictedTraverse(url, None)\n
+ if resource_value is not None:\n
+ if resource_value.getPortalType() == \'Category\':\n
+ category_relative_url = resource_value.getCategoryRelativeUrl()\n
+ else:\n
+ category_relative_url = resource_value.getRelativeUrl()\n
+ result.append((resource_value.getTranslatedTitle(), category_relative_url))\n
except Unauthorized:\n
pass\n
return result\n
Modified: erp5/trunk/bt5/erp5_crm/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/bt/revision?rev=45624&r1=45623&r2=45624&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_crm/bt/revision [utf8] Fri Apr 22 10:26:57 2011
@@ -1 +1 @@
-541
\ No newline at end of file
+542
\ No newline at end of file
More information about the Erp5-report
mailing list