Commit 54c19a6e authored by Yusei Tahara's avatar Yusei Tahara

Use business_field_title argument on portal_catalog instead.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20821 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 4dd39eb3
...@@ -79,7 +79,7 @@ for i in catalog(portal_type=\'Glossary Term\',\n ...@@ -79,7 +79,7 @@ for i in catalog(portal_type=\'Glossary Term\',\n
\n \n
if catalog.getResultValue(portal_type=\'Glossary Term\',\n if catalog.getResultValue(portal_type=\'Glossary Term\',\n
reference=reference,\n reference=reference,\n
business_field=business_field,\n business_field_title=business_field,\n
language_id=language) is not None:\n language_id=language) is not None:\n
continue\n continue\n
\n \n
......
...@@ -80,7 +80,7 @@ else:\n ...@@ -80,7 +80,7 @@ else:\n
for i in result:\n for i in result:\n
item_list = portal_catalog(portal_type=\'Glossary Term\',\n item_list = portal_catalog(portal_type=\'Glossary Term\',\n
reference=i[\'reference\'], language=i[\'language\'],\n reference=i[\'reference\'], language=i[\'language\'],\n
business_field=i[\'business_field\'],\n business_field_title=i[\'business_field\'],\n
validation_state="!=deleted")\n validation_state="!=deleted")\n
if len(item_list)>0:\n if len(item_list)>0:\n
continue\n continue\n
......
...@@ -76,7 +76,7 @@ def get_term_list(business_field, reference):\n ...@@ -76,7 +76,7 @@ def get_term_list(business_field, reference):\n
term_list = portal_catalog(portal_type=\'Glossary Term\',\n term_list = portal_catalog(portal_type=\'Glossary Term\',\n
validation_state=\'validated\',\n validation_state=\'validated\',\n
language=\'en\',\n language=\'en\',\n
business_field=business_field,\n business_field_title=business_field,\n
reference=reference)\n reference=reference)\n
return [i.getObject() for i in term_list]\n return [i.getObject() for i in term_list]\n
\n \n
......
...@@ -83,7 +83,7 @@ catalog = context.portal_catalog\n ...@@ -83,7 +83,7 @@ catalog = context.portal_catalog\n
\n \n
for i in catalog(portal_type=\'Glossary Term\',\n for i in catalog(portal_type=\'Glossary Term\',\n
validation_state=\'validated\',\n validation_state=\'validated\',\n
business_field=business_field_list,\n business_field_title=business_field_list,\n
language=language):\n language=language):\n
term = i.getObject()\n term = i.getObject()\n
reference = term.getReference()\n reference = term.getReference()\n
...@@ -93,7 +93,7 @@ for i in catalog(portal_type=\'Glossary Term\',\n ...@@ -93,7 +93,7 @@ for i in catalog(portal_type=\'Glossary Term\',\n
validation_state=\'validated\',\n validation_state=\'validated\',\n
language=\'en\',\n language=\'en\',\n
reference=reference,\n reference=reference,\n
business_field=business_field)\n business_field_title=business_field)\n
if english_term is None:\n if english_term is None:\n
raise ValueError, \'Corresponding English term to "%s" does not exist in glossary.\' % term.Title()\n raise ValueError, \'Corresponding English term to "%s" does not exist in glossary.\' % term.Title()\n
\n \n
...@@ -102,17 +102,18 @@ for i in catalog(portal_type=\'Glossary Term\',\n ...@@ -102,17 +102,18 @@ for i in catalog(portal_type=\'Glossary Term\',\n
\n \n
english_title = english_term.getTitle()\n english_title = english_term.getTitle()\n
english_description = english_term.getDescription()\n english_description = english_term.getDescription()\n
english_relative_url = english_term.getRelativeUrl()\n
\n \n
if translated_title:\n if translated_title:\n
if not english_title:\n if not english_title:\n
raise ValueError, \'Title of corresponding English term to "%s" is empty.\' % translated_title\n raise ValueError, \'Title of corresponding English term(%s) to "%s" is empty.\' % (english_relative_url, translated_title)\n
if translated_title!=english_title:\n if translated_title!=english_title:\n
print MESSAGE_TEMPLATE % {\'english\':format(english_title),\n print MESSAGE_TEMPLATE % {\'english\':format(english_title),\n
\'translation\':format(translated_title)}\n \'translation\':format(translated_title)}\n
\n \n
if translated_description:\n if translated_description:\n
if not english_description:\n if not english_description:\n
raise ValueError, \'Description of corresponding English term to "%s" is empty.\' % translated_description\n raise ValueError, \'Description of corresponding English term(%s) to "%s" is empty.\' % (english_relative_url, translated_description)\n
\n \n
if translated_description!=english_description:\n if translated_description!=english_description:\n
print MESSAGE_TEMPLATE % {\'english\':format(english_description),\n print MESSAGE_TEMPLATE % {\'english\':format(english_description),\n
...@@ -187,6 +188,7 @@ return printed\n ...@@ -187,6 +188,7 @@ return printed\n
<string>translated_description</string> <string>translated_description</string>
<string>english_title</string> <string>english_title</string>
<string>english_description</string> <string>english_description</string>
<string>english_relative_url</string>
<string>RESPONSE</string> <string>RESPONSE</string>
</tuple> </tuple>
</value> </value>
......
218 219
\ No newline at end of file \ No newline at end of file
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