Skip to content

erp5
erp5
Commit 5ee5efac authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki
Browse files
Options

the argument name for sort in portal_catalog is not 'order_by' but 'sort_on'. 


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28377 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent abb36c89
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 18 deletions
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/NotificationTool_getDocumentValue.xml
View file @ 5ee5efac
...@@ -81,7 +81,7 @@ notification_message_list = portal_catalog(reference=reference,\n ...@@ -81,7 +81,7 @@ notification_message_list = portal_catalog(reference=reference,\n
portal_type=valid_portal_type_list,\n portal_type=valid_portal_type_list,\n
validation_state=validation_state,\n validation_state=validation_state,\n
language=language,\n language=language,\n
order_by=[(\'version\', \'descending\')],\n sort_on=[(\'version\', \'descending\')],\n
group_by=(\'reference\',),\n group_by=(\'reference\',),\n
**kw)\n **kw)\n
\n \n
...@@ -91,7 +91,7 @@ if len(notification_message_list) == 0 and language != \'en\':\n ...@@ -91,7 +91,7 @@ if len(notification_message_list) == 0 and language != \'en\':\n
portal_type=valid_portal_type_list,\n portal_type=valid_portal_type_list,\n
validation_state=validation_state,\n validation_state=validation_state,\n
language=\'en\',\n language=\'en\',\n
order_by=[(\'version\', \'descending\')],\n sort_on=[(\'version\', \'descending\')],\n
group_by=(\'reference\',),\n group_by=(\'reference\',),\n
**kw)\n **kw)\n
\n \n
...@@ -100,7 +100,7 @@ if len(notification_message_list) == 0:\n ...@@ -100,7 +100,7 @@ if len(notification_message_list) == 0:\n
notification_message_list = portal_catalog(reference=reference,\n notification_message_list = portal_catalog(reference=reference,\n
portal_type=valid_portal_type_list,\n portal_type=valid_portal_type_list,\n
validation_state=validation_state,\n validation_state=validation_state,\n
order_by=[(\'version\', \'descending\')],\n sort_on=[(\'version\', \'descending\')],\n
group_by=(\'reference\',),\n group_by=(\'reference\',),\n
**kw)\n **kw)\n
\n \n
......
bt5/erp5_base/bt/revision
View file @ 5ee5efac
625 626
\ No newline at end of file \ No newline at end of file
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/WebSection_getDocumentValue.xml
View file @ 5ee5efac
...@@ -94,7 +94,7 @@ web_page_list = portal_catalog(reference=name,\n ...@@ -94,7 +94,7 @@ web_page_list = portal_catalog(reference=name,\n
portal_type=valid_portal_type_list,\n portal_type=valid_portal_type_list,\n
validation_state=validation_state,\n validation_state=validation_state,\n
language=language,\n language=language,\n
order_by=[(\'version\', \'descending\')],\n sort_on=[(\'version\', \'descending\')],\n
group_by=(\'reference\',),\n group_by=(\'reference\',),\n
limit=1,\n limit=1,\n
**kw)\n **kw)\n
...@@ -105,7 +105,7 @@ if len(web_page_list) == 0 and language != \'en\':\n ...@@ -105,7 +105,7 @@ if len(web_page_list) == 0 and language != \'en\':\n
portal_type=valid_portal_type_list,\n portal_type=valid_portal_type_list,\n
validation_state=validation_state,\n validation_state=validation_state,\n
language=\'en\',\n language=\'en\',\n
order_by=[(\'version\', \'descending\')],\n sort_on=[(\'version\', \'descending\')],\n
group_by=(\'reference\',),\n group_by=(\'reference\',),\n
limit=1,\n limit=1,\n
**kw)\n **kw)\n
...@@ -115,7 +115,7 @@ if len(web_page_list) == 0:\n ...@@ -115,7 +115,7 @@ if len(web_page_list) == 0:\n
web_page_list = portal_catalog(reference=name,\n web_page_list = portal_catalog(reference=name,\n
portal_type=valid_portal_type_list,\n portal_type=valid_portal_type_list,\n
validation_state=validation_state,\n validation_state=validation_state,\n
order_by=[(\'version\', \'descending\')],\n sort_on=[(\'version\', \'descending\')],\n
group_by=(\'reference\',),\n group_by=(\'reference\',),\n
limit=1,\n limit=1,\n
**kw)\n **kw)\n
...@@ -127,7 +127,7 @@ if len(web_page_list) == 0:\n ...@@ -127,7 +127,7 @@ if len(web_page_list) == 0:\n
web_page_list = portal_catalog(reference=name_without_web_site,\n web_page_list = portal_catalog(reference=name_without_web_site,\n
portal_type=valid_portal_type_list,\n portal_type=valid_portal_type_list,\n
validation_state=validation_state,\n validation_state=validation_state,\n
order_by=[(\'version\', \'descending\')],\n sort_on=[(\'version\', \'descending\')],\n
group_by=(\'reference\',),\n group_by=(\'reference\',),\n
limit=1,\n limit=1,\n
**kw)\n **kw)\n
...@@ -139,7 +139,7 @@ if len(web_page_list) == 0:\n ...@@ -139,7 +139,7 @@ if len(web_page_list) == 0:\n
web_page_list = portal_catalog(reference=name_without_portal_type,\n web_page_list = portal_catalog(reference=name_without_portal_type,\n
portal_type=valid_portal_type_list,\n portal_type=valid_portal_type_list,\n
validation_state=validation_state,\n validation_state=validation_state,\n
order_by=[(\'version\', \'descending\')],\n sort_on=[(\'version\', \'descending\')],\n
group_by=(\'reference\',),\n group_by=(\'reference\',),\n
limit=1,\n limit=1,\n
**kw)\n **kw)\n
...@@ -151,7 +151,7 @@ if len(web_page_list) == 0:\n ...@@ -151,7 +151,7 @@ if len(web_page_list) == 0:\n
web_page_list = portal_catalog(reference=name_without_portal_type_and_web_site,\n web_page_list = portal_catalog(reference=name_without_portal_type_and_web_site,\n
portal_type=valid_portal_type_list,\n portal_type=valid_portal_type_list,\n
validation_state=validation_state,\n validation_state=validation_state,\n
order_by=[(\'version\', \'descending\')],\n sort_on=[(\'version\', \'descending\')],\n
group_by=(\'reference\',),\n group_by=(\'reference\',),\n
limit=1,\n limit=1,\n
**kw)\n **kw)\n
...@@ -163,7 +163,7 @@ if len(web_page_list) == 0:\n ...@@ -163,7 +163,7 @@ if len(web_page_list) == 0:\n
web_page_list = portal_catalog(reference=name_without_web_site_and_view,\n web_page_list = portal_catalog(reference=name_without_web_site_and_view,\n
portal_type=valid_portal_type_list,\n portal_type=valid_portal_type_list,\n
validation_state=validation_state,\n validation_state=validation_state,\n
order_by=[(\'version\', \'descending\')],\n sort_on=[(\'version\', \'descending\')],\n
group_by=(\'reference\',),\n group_by=(\'reference\',),\n
limit=1,\n limit=1,\n
**kw)\n **kw)\n
...@@ -176,7 +176,7 @@ if len(web_page_list) == 0:\n ...@@ -176,7 +176,7 @@ if len(web_page_list) == 0:\n
web_page_list = portal_catalog(reference=state,\n web_page_list = portal_catalog(reference=state,\n
portal_type=valid_portal_type_list,\n portal_type=valid_portal_type_list,\n
validation_state=validation_state,\n validation_state=validation_state,\n
order_by=[(\'version\', \'descending\')],\n sort_on=[(\'version\', \'descending\')],\n
group_by=(\'reference\',),\n group_by=(\'reference\',),\n
limit=1,\n limit=1,\n
**kw)\n **kw)\n
......
bt5/erp5_egov/bt/revision
View file @ 5ee5efac
458 459
\ No newline at end of file \ No newline at end of file
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getDocumentValue.xml
View file @ 5ee5efac
...@@ -94,7 +94,7 @@ web_page_list = portal_catalog(reference=name,\n ...@@ -94,7 +94,7 @@ web_page_list = portal_catalog(reference=name,\n
portal_type=valid_portal_type_list,\n portal_type=valid_portal_type_list,\n
validation_state=validation_state,\n validation_state=validation_state,\n
language=language,\n language=language,\n
order_by=[(\'version\', \'descending\')],\n sort_on=[(\'version\', \'descending\')],\n
group_by=(\'reference\',),\n group_by=(\'reference\',),\n
**kw)\n **kw)\n
\n \n
...@@ -104,7 +104,7 @@ if len(web_page_list) == 0 and language != \'en\':\n ...@@ -104,7 +104,7 @@ if len(web_page_list) == 0 and language != \'en\':\n
portal_type=valid_portal_type_list,\n portal_type=valid_portal_type_list,\n
validation_state=validation_state,\n validation_state=validation_state,\n
language=\'en\',\n language=\'en\',\n
order_by=[(\'version\', \'descending\')],\n sort_on=[(\'version\', \'descending\')],\n
group_by=(\'reference\',),\n group_by=(\'reference\',),\n
**kw)\n **kw)\n
\n \n
...@@ -113,7 +113,7 @@ if len(web_page_list) == 0:\n ...@@ -113,7 +113,7 @@ if len(web_page_list) == 0:\n
web_page_list = portal_catalog(reference=name,\n web_page_list = portal_catalog(reference=name,\n
portal_type=valid_portal_type_list,\n portal_type=valid_portal_type_list,\n
validation_state=validation_state,\n validation_state=validation_state,\n
order_by=[(\'version\', \'descending\')],\n sort_on=[(\'version\', \'descending\')],\n
group_by=(\'reference\',),\n group_by=(\'reference\',),\n
**kw)\n **kw)\n
\n \n
......
bt5/erp5_web/bt/revision
View file @ 5ee5efac
837 838
\ No newline at end of file \ No newline at end of file
product/ERP5/Document/Document.py
View file @ 5ee5efac
...@@ -769,7 +769,7 @@ class Document(PermanentURLMixIn, XMLObject, UrlMixIn, ConversionCacheMixin, Sna ...@@ -769,7 +769,7 @@ class Document(PermanentURLMixIn, XMLObject, UrlMixIn, ConversionCacheMixin, Sna
catalog = getToolByName(self, 'portal_catalog', None) catalog = getToolByName(self, 'portal_catalog', None)
kw = dict(portal_type=self.getPortalType(), kw = dict(portal_type=self.getPortalType(),
reference=self.getReference(), reference=self.getReference(),
order_by=(('version', 'descending', 'SIGNED'),) sort_on=(('version', 'descending', 'SIGNED'),)
) )
if version: kw['version'] = version if version: kw['version'] = version
if language: kw['language'] = language if language: kw['language'] = language
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7