[Erp5-report] r23538 - in /erp5/trunk/bt5/erp5_egov: SkinTemplateItem/portal_skins/erp5_ego...

[nobody at svn.erp5.org]

Author: fabien
Date: Wed Sep 10 10:58:45 2008
New Revision: 23538

URL: http://svn.erp5.org?rev=23538&view=rev
Log:
correct a bug of the track button (was not working with empty application number)

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

Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_goToDocument.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_goToDocument.xml?rev=23538&r1=23537&r2=23538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_goToDocument.xml (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_goToDocument.xml Wed Sep 10 10:58:45 2008
@@ -68,23 +68,19 @@
             <value> <string>portal = context.getPortalObject()\n
 N_ = portal.Base_translateString\n
 \n
-if application_number is not None:\n
+if not application_number and id:\n
+  application_number = id\n
+\n
+if application_number:\n
   document = context.portal_catalog.getResultValue(id=application_number)\n
   if document is not None:\n
     if document.getValidationState() == \'draft\':\n
       return document.Base_redirect(form_id=\'view\')\n
     return document.Base_redirect(form_id=\'PDFDocument_viewHistory\')\n
-else:\n
-  document = context.portal_catalog.getResultValue(id=id)\n
-  if document is not None:\n
-    if document.getValidationState() == \'draft\':\n
-      return document.Base_redirect(form_id=\'view\')\n
-    return document.Base_redirect(form_id=\'PDFDocument_viewHistory\')\n
-\n
 \n
 # Prepare message\n
 msg = N_(\'Sorry, this document is not available\')\n
-return context.Base_redirect(form_id=\'view\', keep_items = {\'portal_status_message\' : msg, \'editable_mode\' : False})\n
+return context.Base_redirect(form_id=\'view\', keep_items = {\'portal_status_message\' : msg})\n
 </string> </value>
         </item>
         <item>
@@ -148,10 +144,9 @@
                             <string>context</string>
                             <string>portal</string>
                             <string>N_</string>
+                            <string>document</string>
                             <string>None</string>
-                            <string>document</string>
                             <string>msg</string>
-                            <string>False</string>
                           </tuple>
                         </value>
                     </item>
@@ -174,6 +169,12 @@
             <value> <string>EGov_goToDocument</string> </value>
         </item>
         <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
             <key> <string>warnings</string> </key>
             <value>
               <tuple/>

Modified: erp5/trunk/bt5/erp5_egov/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/revision?rev=23538&r1=23537&r2=23538&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/revision (original)
+++ erp5/trunk/bt5/erp5_egov/bt/revision Wed Sep 10 10:58:45 2008
@@ -1,1 +1,1 @@
-281
+282