[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/ - fixed sort_order button

[Yvo Schubbe]

Log message for revision 127214:
  - fixed sort_order button

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py	2012-07-01 10:46:25 UTC (rev 127213)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py	2012-07-01 10:56:50 UTC (rev 127214)
@@ -308,8 +308,7 @@
             name='sort_order',
             label=_(u'Set as Default Sort'),
             condition='can_sort_be_changed',
-            validator='validate_items',
-            success='handle_top',
+            success='handle_sort_order',
             failure='handle_failure')
             )
 
@@ -595,10 +594,8 @@
 
     def handle_sort_order(self, action, data):
         """Set the sort options for the folder."""
-        key = data['position']
-        reverse = data.get('reverse', 0)
-        self.context.setDefaultSorting(key, reverse)
-        self.status = _(u"Sort order changed")
+        self.context.setDefaultSorting(*self._get_sorting())
+        self.status = _(u'Default sort order changed.')
         return self._setRedirect('portal_types', 'object/folderContents')
 
 

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt	2012-07-01 10:46:25 UTC (rev 127213)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt	2012-07-01 10:56:50 UTC (rev 127214)
@@ -60,3 +60,14 @@
     >>> browser.open('http://localhost/site/@@edit.html?form.sort_key=position&form.reverse=1')
     >>> 'name="form.reverse" type="hidden" value="1"' in browser.contents
     True
+
+Change the default sort order:
+
+    >>> browser.open('http://localhost/site/@@edit.html?form.sort_key=getId')
+    >>> '[[cmf_default][Set as Default Sort]]' in browser.contents
+    True
+    >>> browser.getControl('[[cmf_default][Set as Default Sort]]').click()
+    >>> '[[cmf_default][Default sort order changed.]]' in browser.contents
+    True
+    >>> '[[cmf_default][Set as Default Sort]]' in browser.contents
+    False