[Erp5-report] r36621 mayoro - in /erp5/trunk/bt5/erp5_egov: SkinTemplateItem/portal_skins/e...

[nobody at svn.erp5.org]

Author: mayoro
Date: Sun Jun 27 00:31:30 2010
New Revision: 36621

URL: http://svn.erp5.org?rev=36621&view=rev
Log:
2010-06-26 mayoro
* correct previous commit, use contentValues because  of caching method

Modified:
    erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_getReportSectionList.xml
    erp5/trunk/bt5/erp5_egov/bt/change_log
    erp5/trunk/bt5/erp5_egov/bt/revision

Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_getReportSectionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_getReportSectionList.xml?rev=36621&r1=36620&r2=36621&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_getReportSectionList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_getReportSectionList.xml [utf8] Sun Jun 27 00:31:30 2010
@@ -65,13 +65,14 @@ file_type_list = (\'Image\', \'File\')\n
 sub_form_type_list = filter(lambda x: x not in file_type_list, type_list)\n
 \n
 # A simple solution: use title to group\n
-viewable_content_list = [x.getObject() for x in context.searchFolder(validation_state = [\'embedded\',\'draft\'])]\n
+viewable_content_list = context.contentValues(portal_type=type_list, checked_permission=\'View\',validation_state = \'embedded\')\n
 \n
 content_group_dict = {}\n
 for content in viewable_content_list:\n
-  title = content.getTitle()\n
-  content_group_dict.setdefault(title, [])\n
-  content_group_dict[title].append(content)\n
+  if content.getValidationState() in [\'embedded\',\'draft\']:\n
+    title = content.getTitle()\n
+    content_group_dict.setdefault(title, [])\n
+    content_group_dict[title].append(content)\n
 \n
 # Now sort every group by creation date (to be done)\n
 # XXXX\n
@@ -138,6 +139,14 @@ return result\n
             <value> <string></string> </value>
         </item>
         <item>
+            <key> <string>_proxy_roles</string> </key>
+            <value>
+              <tuple>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
             <key> <string>errors</string> </key>
             <value>
               <tuple/>
@@ -170,12 +179,9 @@ return result\n
                             <string>file_type_list</string>
                             <string>filter</string>
                             <string>sub_form_type_list</string>
-                            <string>append</string>
-                            <string>$append0</string>
-                            <string>_getiter_</string>
-                            <string>x</string>
                             <string>viewable_content_list</string>
                             <string>content_group_dict</string>
+                            <string>_getiter_</string>
                             <string>content</string>
                             <string>title</string>
                             <string>_getitem_</string>

Modified: erp5/trunk/bt5/erp5_egov/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/change_log?rev=36621&r1=36620&r2=36621&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/bt/change_log [utf8] Sun Jun 27 00:31:30 2010
@@ -1,4 +1,7 @@
 2010-06-26 mayoro
+* correct previous commit, use contentValues because  of caching method
+
+2010-06-26 mayoro
 * Add erp5_html_compatibility in EGov registered skin selection, needed for form_view_dialog
 * Use  catalog to search for attachments
 * Make change password available just for Person or Organisation accounts (not for procedure)

Modified: erp5/trunk/bt5/erp5_egov/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/revision?rev=36621&r1=36620&r2=36621&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/bt/revision [utf8] Sun Jun 27 00:31:30 2010
@@ -1 +1 @@
-645
\ No newline at end of file
+652
\ No newline at end of file