fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [15333] shorten download url


From: sigurdne
Subject: [Fmsystem-commits] [15333] shorten download url
Date: Fri, 24 Jun 2016 10:44:48 +0000 (UTC)

Revision: 15333
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15333
Author:   sigurdne
Date:     2016-06-24 10:44:48 +0000 (Fri, 24 Jun 2016)
Log Message:
-----------
shorten download url

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-06-24 10:44:10 UTC 
(rev 15332)
+++ trunk/phpgwapi/templates/base/datatable_jquery.xsl  2016-06-24 10:44:48 UTC 
(rev 15333)
@@ -657,7 +657,7 @@
                                                },
                                        </xsl:when>
                                </xsl:choose>
-                               'excelHtml5',
+                               'csvHtml5',
                                <xsl:choose>
                                        <xsl:when test="download">
                                                ,{
@@ -682,8 +682,26 @@
                                                                var iframe = 
document.createElement('iframe');
                                                                
iframe.style.height = "0px";
                                                                
iframe.style.width = "0px";
+                                                               
console.log(oParams);
+
+                                                               
if(typeof(oParams.order[0]) != 'undefined')
+                                                               {
+                                                                       var 
column = oParams.order[0].column;
+                                                                       var dir 
= oParams.order[0].dir;
+                                                                       var 
column_to_keep = oParams.columns[column];
+                                                                       delete 
oParams.columns;
+                                                                       
oParams.columns = {};
+                                                                       
if(JqueryPortico.columns[column]['orderable'] == true)
+                                                                       {
+                                                                               
oParams.columns[column] = column_to_keep;
+                                                                       }
+                                                               }
+                                                               else
+                                                               {
+                                                                               
delete oParams.columns;
+                                                               }
+
                                                                iframe.src = 
sUrl+"&"+$.param(oParams) + "&export=1" + "&query=" + $('div.dataTables_filter 
input').val();
-
                                                                
if(confirm("This will take some time..."))
                                                                {
                                                                        
document.body.appendChild( iframe );




reply via email to

[Prev in Thread] Current Thread [Next in Thread]