[Erp5-report] r40428 kazuhiko - /erp5/trunk/products/ERP5Form/Tool/SelectionTool.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Nov 19 22:43:57 2010
New Revision: 40428

URL: http://svn.erp5.org?rev=40428&view=rev
Log:
make the URL shorter.
* omit '/view'.
* omit ignore_layout:int=0.

Modified:
    erp5/trunk/products/ERP5Form/Tool/SelectionTool.py

Modified: erp5/trunk/products/ERP5Form/Tool/SelectionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/Tool/SelectionTool.py?rev=40428&r1=40427&r2=40428&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/Tool/SelectionTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Form/Tool/SelectionTool.py [utf8] Fri Nov 19 22:43:57 2010
@@ -644,7 +644,11 @@ class SelectionTool( BaseTool, SimpleIte
       else:
         url = REQUEST.getURL()
       ignore_layout = int(REQUEST.get('ignore_layout', 0))
-      url = '%s/%s?selection_index=%s&selection_name=%s&ignore_layout:int=%s' % (url, form_id, 0, selection_name, ignore_layout)
+      if form_id != 'view':
+        url += '/%s' % form_id
+      url += '?selection_index=%s&selection_name=%s' % (0, selection_name)
+      if ignore_layout:
+        url += '&ignore_layout:int=1'
       REQUEST.RESPONSE.redirect(url)
 
     security.declareProtected(ERP5Permissions.View, 'viewLast')
@@ -667,7 +671,11 @@ class SelectionTool( BaseTool, SimpleIte
       else:
         url = REQUEST.getURL()
       ignore_layout = int(REQUEST.get('ignore_layout', 0))
-      url = '%s/%s?selection_index=%s&selection_name=%s&ignore_layout:int=%s' % (url, form_id, -1, selection_name, ignore_layout)
+      if form_id != 'view':
+        url += '/%s' % form_id
+      url += '?selection_index=%s&selection_name=%s' % (-1, selection_name)
+      if ignore_layout:
+        url += '&ignore_layout:int=1'
       REQUEST.RESPONSE.redirect(url)
 
     security.declareProtected(ERP5Permissions.View, 'viewNext')
@@ -690,7 +698,12 @@ class SelectionTool( BaseTool, SimpleIte
       else:
         url = REQUEST.getURL()
       ignore_layout = int(REQUEST.get('ignore_layout', 0))
-      url = '%s/%s?selection_index=%s&selection_name=%s&ignore_layout:int=%s' % (url, form_id, int(selection_index) + 1, selection_name, ignore_layout)
+      if form_id != 'view':
+        url += '/%s' % form_id
+      url += '?selection_index=%s&selection_name=%s' % (int(selection_index)+1,
+                                                        selection_name)
+      if ignore_layout:
+        url += '&ignore_layout:int=1'
       REQUEST.RESPONSE.redirect(url)
 
     security.declareProtected(ERP5Permissions.View, 'viewPrevious')
@@ -713,7 +726,12 @@ class SelectionTool( BaseTool, SimpleIte
       else:
         url = REQUEST.getURL()
       ignore_layout = int(REQUEST.get('ignore_layout', 0))
-      url = '%s/%s?selection_index=%s&selection_name=%s&ignore_layout:int=%s' % (url, form_id, int(selection_index) - 1, selection_name, ignore_layout)
+      if form_id != 'view':
+        url += '/%s' % form_id
+      url += '?selection_index=%s&selection_name=%s' % (int(selection_index)-1,
+                                                        selection_name)
+      if ignore_layout:
+        url += '&ignore_layout:int=1'
       REQUEST.RESPONSE.redirect(url)