[Fmsystem-commits] [14791] order by legal columns

[Sigurd Nes]

Revision: 14791
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14791
Author:   sigurdne
Date:     2016-03-01 14:02:30 +0000 (Tue, 01 Mar 2016)
Log Message:
-----------
order by legal columns

Modified Paths:
--------------
    trunk/phpgwapi/templates/base/datatable_jquery.xsl

Modified: trunk/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- trunk/phpgwapi/templates/base/datatable_jquery.xsl  2016-03-01 12:48:12 UTC 
(rev 14790)
+++ trunk/phpgwapi/templates/base/datatable_jquery.xsl  2016-03-01 14:02:30 UTC 
(rev 14791)
@@ -935,23 +935,24 @@
                                                var column_to_keep = 
aoData.columns[column];
                                                delete aoData.columns;
                                                aoData.columns = {};
-                                               aoData.columns[column] = 
column_to_keep;
+                                               
if(JqueryPortico.columns[column]['orderable'] == true)
+                                               {
+                                                       aoData.columns[column] 
= column_to_keep;
+                                               }
                                        }
-
                                        active_filters_html = [];
                                        var select = null;
                                        for (var i in filter_selects)
                                        {
-                                                 select = $("#" + 
filter_selects[i]);
-                                                 var select_name = 
select.prop("name");
-                                                 var select_value = 
select.val();
-                                                 aoData[select_name] = 
select_value;
+                                               select = $("#" + 
filter_selects[i]);
+                                               var select_name = 
select.prop("name");
+                                               var select_value = select.val();
+                                               aoData[select_name] = 
select_value;
 
-                                                 if(select_value && 
select_value !=0 )
-                                                 {
+                                               if(select_value && select_value 
!=0 )
+                                               {
                                                        
active_filters_html.push(i);
-                                                 }
-
+                                               }
                                        }
 
                                        if(active_filters_html.length > 0)