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

[nobody at svn.erp5.org]

Author: mayoro
Date: Wed Jun 23 20:36:41 2010
New Revision: 36558

URL: http://svn.erp5.org?rev=36558&view=rev
Log:
2010-06-23 mayoro
* modify ERP5Site_getQuickSearchableTypeList to allow processing anonymous and not anonymous procedure
* after login redirect in desired default page (default view)

Modified:
    erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/ERP5Site_getQuickSearchableTypeList.xml
    erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_theme/WebSite_login.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/ERP5Site_getQuickSearchableTypeList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/ERP5Site_getQuickSearchableTypeList.xml?rev=36558&r1=36557&r2=36558&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/ERP5Site_getQuickSearchableTypeList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/ERP5Site_getQuickSearchableTypeList.xml [utf8] Wed Jun 23 20:36:41 2010
@@ -53,7 +53,16 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>type_list = context.EGov_getAllowedFormTypeList() + (\'Person\', \'Organisation\')\n
+            <value> <string>portal_types = context.getPortalObject().portal_types\n
+validated_type_list = portal_types.searchFolder(portal_type=\'EGov Type\', validation_state = \'validated\')\n
+\n
+portal_type_list = ()\n
+\n
+for portal_type in validated_type_list:\n
+  portal_type_list += (portal_type.getTitle(),)\n
+\n
+\n
+type_list = portal_type_list + (\'Person\', \'Organisation\')\n
 return type_list\n
 </string> </value>
         </item>
@@ -93,6 +102,12 @@ return type_list\n
                           <tuple>
                             <string>_getattr_</string>
                             <string>context</string>
+                            <string>portal_types</string>
+                            <string>validated_type_list</string>
+                            <string>portal_type_list</string>
+                            <string>_getiter_</string>
+                            <string>portal_type</string>
+                            <string>_inplacevar_</string>
                             <string>type_list</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_theme/WebSite_login.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_theme/WebSite_login.xml?rev=36558&r1=36557&r2=36558&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_theme/WebSite_login.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_theme/WebSite_login.xml [utf8] Wed Jun 23 20:36:41 2010
@@ -65,7 +65,7 @@
         </tal:block>\n
       </tal:block>\n
       <tal:block tal:condition="python: here.EGov_checkUserIsAPersonOrOrganisation()==True or here.EGov_getUserDocumentUrl()==None">\n
-        <tal:block tal:define="came_from python: request.get(\'came_from\') or request.get(\'field_came_from\') or request.get(\'field_came_from\') or here.absolute_url() + \'/view\';\n
+        <tal:block tal:define="came_from python: request.get(\'came_from\') or request.get(\'field_came_from\') or request.get(\'field_came_from\') or here.absolute_url();\n
                    dummy python: response.redirect(came_from);" />\n
       </tal:block>\n
     </tal:block>\n

Modified: erp5/trunk/bt5/erp5_egov/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/change_log?rev=36558&r1=36557&r2=36558&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/bt/change_log [utf8] Wed Jun 23 20:36:41 2010
@@ -1,4 +1,8 @@
 2010-06-23 mayoro
+* modify ERP5Site_getQuickSearchableTypeList to allow processing anonymous and not anonymous procedure
+* after login redirect in desired default page (default view)
+
+2010-06-23 mayoro
 * Allow manager to set own password for procedures
 
 2010-06-23 mayoro

Modified: erp5/trunk/bt5/erp5_egov/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/revision?rev=36558&r1=36557&r2=36558&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/bt/revision [utf8] Wed Jun 23 20:36:41 2010
@@ -1 +1 @@
-609
\ No newline at end of file
+613
\ No newline at end of file