[Fmsystem-commits] [13056] more on POST?\226?\136?\149GET data

[Sigurd Nes]

Revision: 13056
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13056
Author:   sigurdne
Date:     2015-04-22 08:34:49 +0000 (Wed, 22 Apr 2015)
Log Message:
-----------
more on POST?\226?\136?\149GET data

Modified Paths:
--------------
    branches/dev-syncromind/phpgwapi/js/jquery/common.js
    branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl

Modified: branches/dev-syncromind/phpgwapi/js/jquery/common.js
===================================================================
--- branches/dev-syncromind/phpgwapi/js/jquery/common.js        2015-04-21 
23:33:05 UTC (rev 13055)
+++ branches/dev-syncromind/phpgwapi/js/jquery/common.js        2015-04-22 
08:34:49 UTC (rev 13056)
@@ -229,12 +229,15 @@
                        data:                   data,
                        ajax:                   ajax_def,
                        fnServerParams: function ( aoData ) {
-                               var column = aoData.order[0].column;
-                               var dir = aoData.order[0].dir;
-                               var column_to_keep = aoData.columns[column];
-                               delete aoData.columns;
-                               aoData.columns = {};
-                               aoData.columns[column] = column_to_keep;
+                               if(typeof(aoData.order) != 'undefined')
+                               {
+                                       var column = aoData.order[0].column;
+                                       var dir = aoData.order[0].dir;
+                                       var column_to_keep = 
aoData.columns[column];
+                                       delete aoData.columns;
+                                       aoData.columns = {};
+                                       aoData.columns[column] = column_to_keep;
+                               }
                         },
                        fnInitComplete: function (oSettings, json)
                        {

Modified: branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl        
2015-04-21 23:33:05 UTC (rev 13055)
+++ branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl        
2015-04-22 08:34:49 UTC (rev 13056)
@@ -724,12 +724,15 @@
                                        type: 'GET'
                                },
                                fnServerParams: function ( aoData ) {
-                                       var column = aoData.order[0].column;
-                                       var dir = aoData.order[0].dir;
-                                       var column_to_keep = 
aoData.columns[column];
-                                       delete aoData.columns;
-                                       aoData.columns = {};
-                                       aoData.columns[column] = column_to_keep;
+                                       if(typeof(aoData.order) != 'undefined')
+                                       {
+                                               var column = 
aoData.order[0].column;
+                                               var dir = aoData.order[0].dir;
+                                               var column_to_keep = 
aoData.columns[column];
+                                               delete aoData.columns;
+                                               aoData.columns = {};
+                                               aoData.columns[column] = 
column_to_keep;
+                                       }
                                 },
                                fnRowCallback: function(nRow, aData, 
iDisplayIndex, iDisplayIndexFull) {
                                                                
if(typeof(aData['priority'])!= undefined && aData['priority'] > 0)