Skip to content

erp5
erp5
Commit f09b2acf authored by Fabien Morin's avatar Fabien Morin
Browse files
Options

update some listbox to be able to handle searchable text and to be able to... 

update some listbox to be able to handle searchable text and to be able to sort application by modification date (descending).

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@24201 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 6432e40f
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 37 deletions
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_viewMyDocumentList/listboxMyDocuments.xml
View file @ f09b2acf
...@@ -475,7 +475,7 @@ ...@@ -475,7 +475,7 @@
<list> <list>
<tuple> <tuple>
<string>modification_date</string> <string>modification_date</string>
<string>Modification Date</string> <string>descending</string>
</tuple> </tuple>
</list> </list>
</value> </value>
...@@ -505,6 +505,12 @@ ...@@ -505,6 +505,12 @@
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>My Documents</string> </value> <value> <string>My Documents</string> </value>
</item> </item>
<item>
<key> <string>untranslatable_columns</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>url_columns</string> </key> <key> <string>url_columns</string> </key>
<value> <value>
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_viewPendingApplicationList.xml
View file @ f09b2acf
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <value>
<list> <list>
<string>listbox_getCreationDate</string> <string>listbox_modification_date</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_viewPendingApplicationList/listbox.xml
View file @ f09b2acf
...@@ -349,8 +349,8 @@ ...@@ -349,8 +349,8 @@
<string>Validation State</string> <string>Validation State</string>
</tuple> </tuple>
<tuple> <tuple>
<string>getCreationDate</string> <string>modification_date</string>
<string>Creation Date</string> <string>Modification Date</string>
</tuple> </tuple>
</list> </list>
</value> </value>
...@@ -392,7 +392,7 @@ ...@@ -392,7 +392,7 @@
<value> <value>
<list> <list>
<tuple> <tuple>
<string>getCreationDate</string> <string>modification_date</string>
<string>Modification Date</string> <string>Modification Date</string>
</tuple> </tuple>
</list> </list>
...@@ -469,7 +469,7 @@ ...@@ -469,7 +469,7 @@
<string>Application Number</string> <string>Application Number</string>
</tuple> </tuple>
<tuple> <tuple>
<string>owner</string> <string>getOwner</string>
<string>Actor</string> <string>Actor</string>
</tuple> </tuple>
<tuple> <tuple>
...@@ -481,8 +481,8 @@ ...@@ -481,8 +481,8 @@
<string>Validation State</string> <string>Validation State</string>
</tuple> </tuple>
<tuple> <tuple>
<string>getCreationDate</string> <string>modification_date</string>
<string>Creation Date</string> <string>Modification Date</string>
</tuple> </tuple>
</list> </list>
</value> </value>
...@@ -500,8 +500,8 @@ ...@@ -500,8 +500,8 @@
<value> <value>
<list> <list>
<tuple> <tuple>
<string>getCreationDate</string> <string>modification_date</string>
<string>getCreationDate</string> <string>descending</string>
</tuple> </tuple>
</list> </list>
</value> </value>
...@@ -511,8 +511,8 @@ ...@@ -511,8 +511,8 @@
<value> <value>
<list> <list>
<tuple> <tuple>
<string>getCreationDate</string> <string>modification_date</string>
<string>getCreationDate</string> <string>Modification Date</string>
</tuple> </tuple>
</list> </list>
</value> </value>
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_viewPendingApplicationList/listbox_getCreationDate.xml → bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_viewPendingApplicationList/listbox_modification_date.xml
View file @ f09b2acf
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>listbox_getCreationDate</string> </value> <value> <string>listbox_modification_date</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -342,7 +342,7 @@ ...@@ -342,7 +342,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Creation Date</string> </value> <value> <string>Modification Date</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/MyDocuments_listMethod.xml
View file @ f09b2acf
...@@ -56,10 +56,12 @@ ...@@ -56,10 +56,12 @@
<value> <string># get user name\n <value> <string># get user name\n
user_name = context.portal_membership.getAuthenticatedMember().getUserName()\n user_name = context.portal_membership.getAuthenticatedMember().getUserName()\n
\n \n
return context.portal_catalog(portal_type=context.getPortalDocumentTypeList(), \n if not kw.has_key(\'portal_type\'):\n
sort_on=\'creation_date\', \n kw[\'portal_type\'] = context.getPortalDocumentTypeList()\n
sort_order=\'reverse\',\n if not kw.has_key(\'sort_on\'): \n
owner=user_name);\n kw[\'sort_on\']=[(\'modification_date\', \'descending\')]\n
return context.portal_catalog(owner=user_name,\n
**kw);\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
...@@ -101,6 +103,8 @@ return context.portal_catalog(portal_type=context.getPortalDocumentTypeList(), \ ...@@ -101,6 +103,8 @@ return context.portal_catalog(portal_type=context.getPortalDocumentTypeList(), \
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>user_name</string> <string>user_name</string>
<string>_write_</string>
<string>_apply_</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/PendingApplication_listMethod.xml
View file @ f09b2acf
...@@ -55,26 +55,16 @@ ...@@ -55,26 +55,16 @@
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>portal_type_list = context.EGov_getAllowedFormTypeList()\n <value> <string>portal_type_list = context.EGov_getAllowedFormTypeList()\n
\n \n
validation_state_list=[ \'draft\',\n
\'submitted\', \n
\'paid\', \n
\'validated\', \n
\'assigned\', \n
\'open\', \n
\'requested\', \n
\'suspended\', \n
\'completed\', \n
\'disapproved\',\n
\'approved\',\n
\'signed\']\n
# get user name\n # get user name\n
user_name = context.portal_membership.getAuthenticatedMember().getUserName()\n user_name = context.portal_membership.getAuthenticatedMember().getUserName()\n
\n \n
return context.portal_catalog(portal_type=portal_type_list,\n if not kw.has_key(\'portal_type\'):\n
owner=user_name,\n kw[\'portal_type\'] = portal_type_list\n
sort_on=\'creation_date\', \n if not kw.has_key(\'sort_on\'): \n
sort_order=\'reverse\',\n kw[\'sort_on\']=[(\'modification_date\', \'descending\')]\n
validation_state=validation_state_list)\n result = context.portal_catalog(owner=user_name,\n
**kw)\n
return result\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
...@@ -116,8 +106,10 @@ return context.portal_catalog(portal_type=portal_type_list,\n ...@@ -116,8 +106,10 @@ return context.portal_catalog(portal_type=portal_type_list,\n
<string>_getattr_</string> <string>_getattr_</string>
<string>context</string> <string>context</string>
<string>portal_type_list</string> <string>portal_type_list</string>
<string>validation_state_list</string>
<string>user_name</string> <string>user_name</string>
<string>_write_</string>
<string>_apply_</string>
<string>result</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
bt5/erp5_egov/bt/change_log
View file @ f09b2acf
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
* update some listbox to display the last application in first * update some listbox to display the last application in first
* update css * update css
* add some rights on assignee to the validated state on egov_universal_workflow. This avoid a security error if an agent have an assigned application and refuse it (it will change the state of the application to validated and redirect the agent on it). * add some rights on assignee to the validated state on egov_universal_workflow. This avoid a security error if an agent have an assigned application and refuse it (it will change the state of the application to validated and redirect the agent on it).
* update some listbox to be able to handle searchable text and to be able to sort application by modification date (descending).
2008-10-10 fabien 2008-10-10 fabien
bring some corrections after the Mme Ba review : bring some corrections after the Mme Ba review :
......
bt5/erp5_egov/bt/revision
View file @ f09b2acf
391 394
\ 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7