From 6fab801b7581cb16d4def23b14f4aeb8ef234de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Fri, 16 Apr 2010 11:08:56 +0000
Subject: [PATCH] get sortable columns from normal columns + sort columns, not
 from 'all_columns'

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@34615 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../portal_skins/erp5_xhtml_style/sort_list_dialog.xml         | 3 ++-
 product/ERP5/bootstrap/erp5_xhtml_style/bt/revision            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/sort_list_dialog.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/sort_list_dialog.xml
index dd1b055e36..eaeedc1d13 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/sort_list_dialog.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/sort_list_dialog.xml
@@ -54,7 +54,8 @@
                base_form python:getattr(here,request[\'form_id\']);\n
                groups base_form/get_groups;\n
                listbox python:base_form.Form_getListbox();\n
-               columns python:listbox.get_value(\'all_columns\');\n
+               default_columns python: listbox.get_value(\'columns\');\n
+               columns python: default_columns + [x for x in listbox.get_value(\'sort_columns\') if x not in default_columns];\n
                global row_index python:0;\n
                global row_keys python:[\'None\'];\n
                all_columns python: [(\'None\',\'\')] + columns;">\n
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
index 6160058672..086d92f2e1 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
@@ -1 +1 @@
-928
+929
\ No newline at end of file
-- 
2.30.9