|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [14699] more on buttons |
| Date: | Fri, 05 Feb 2016 08:39:13 +0000 |
Revision: 14699
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14699
Author: sigurdne
Date: 2016-02-05 08:39:12 +0000 (Fri, 05 Feb 2016)
Log Message:
-----------
more on buttons
Modified Paths:
--------------
branches/dev-syncromind/phpgwapi/js/jquery/common.js
branches/dev-syncromind/phpgwapi/templates/base/datatable_inline.xsl
branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
branches/dev-syncromind/property/inc/class.uilocation.inc.php
branches/dev-syncromind/property/inc/class.uirequest.inc.php
branches/dev-syncromind/property/templates/base/lookup.entity.xsl
Modified: branches/dev-syncromind/phpgwapi/js/jquery/common.js
===================================================================
--- branches/dev-syncromind/phpgwapi/js/jquery/common.js 2016-02-04
19:31:41 UTC (rev 14698)
+++ branches/dev-syncromind/phpgwapi/js/jquery/common.js 2016-02-05
08:39:12 UTC (rev 14699)
@@ -220,6 +220,16 @@
var order = options['order'] || [0, 'desc'];
var responsive = options['responsive'] || false;
+ var lengthMenu = null;
+ try
+ {
+ lengthMenu = JqueryPortico.i18n.lengthmenu();
+ }
+ catch(err)
+ {
+ lengthMenu = [10, 25, 50, 100];
+ }
+
data = data || {};
if (ajax_url)
@@ -287,7 +297,7 @@
}
}*/
},
- // lengthMenu: JqueryPortico.i18n.lengthmenu(),
+ lengthMenu: lengthMenu,
// language: JqueryPortico.i18n.datatable(),
columns: columns,
// stateSave: true,
Modified: branches/dev-syncromind/phpgwapi/templates/base/datatable_inline.xsl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/base/datatable_inline.xsl
2016-02-04 19:31:41 UTC (rev 14698)
+++ branches/dev-syncromind/phpgwapi/templates/base/datatable_inline.xsl
2016-02-05 08:39:12 UTC (rev 14699)
@@ -114,9 +114,11 @@
<xsl:when test="my_name = 'download'">
{
text: "<xsl:value-of select="php:function('lang',
'download')"/>",
+
className: 'download',
+
sUrl: '<xsl:value-of select="download"/>',
action: function (e, dt, node, config) {
-
var sUrl = '<xsl:value-of select="download"/>';
-
var addtional_filterdata = oTable<xsl:number
value="($num - 1)"/>.dataTableSettings[0]['ajax']['data'];
+
var sUrl = config.sUrl;
+
var addtional_filterdata = oTable<xsl:number
value="($num - 1)"/>.dataTableSettings[0]['ajax']['data'];
<![CDATA[
var oParams = {};
oParams.length = -1;
Modified: branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
2016-02-04 19:31:41 UTC (rev 14698)
+++ branches/dev-syncromind/phpgwapi/templates/base/datatable_jquery.xsl
2016-02-05 08:39:12 UTC (rev 14699)
@@ -581,7 +581,7 @@
//
}
//
},
<xsl:choose>
- <xsl:when test="select_all">
+ <xsl:when test="select_all = '1'">
{
text: "<xsl:value-of
select="php:function('lang', 'select all')"/>",
action: function () {
@@ -621,28 +621,31 @@
<xsl:when test="download">
,{
text: "<xsl:value-of
select="php:function('lang', 'download')"/>",
+ className: 'download',
+ sUrl: '<xsl:value-of
select="download"/>',
action: function (e, dt, node,
config) {
- var sUrl = '<xsl:value-of
select="download"/>';
-
<![CDATA[
-
var oParams = {};
-
oParams.length = -1;
-
oParams.columns = null;
-
oParams.start = null;
-
oParams.draw = null;
-
var addtional_filterdata =
oTable.dataTableSettings[0]['ajax']['data'];
-
for (var attrname in addtional_filterdata)
-
{
-
oParams[attrname] = addtional_filterdata[attrname];
-
}
-
var iframe = document.createElement('iframe');
-
iframe.style.height = "0px";
-
iframe.style.width = "0px";
-
iframe.src = sUrl+"&"+$.param(oParams) + "&export=1";
-
if(confirm("This will take some time..."))
-
{
-
document.body.appendChild( iframe );
-
}
-
]]>
+ var sUrl = config.sUrl;
+
+ <![CDATA[
+ var oParams =
{};
+ oParams.length
= -1;
+ oParams.columns
= null;
+ oParams.start =
null;
+ oParams.draw =
null;
+ var
addtional_filterdata = oTable.dataTableSettings[0]['ajax']['data'];
+ for (var
attrname in addtional_filterdata)
+ {
+
oParams[attrname] = addtional_filterdata[attrname];
+ }
+ var iframe =
document.createElement('iframe');
+
iframe.style.height = "0px";
+
iframe.style.width = "0px";
+ iframe.src =
sUrl+"&"+$.param(oParams) + "&export=1";
+
if(confirm("This will take some time..."))
+ {
+
document.body.appendChild( iframe );
+ }
+ ]]>
}
}
@@ -841,7 +844,6 @@
serverSide: true,
responsive: true,
select: { style: 'multi' },
-// select: true,
deferRender: true,
ajax: {
url: ajax_url,
Modified: branches/dev-syncromind/property/inc/class.uilocation.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uilocation.inc.php
2016-02-04 19:31:41 UTC (rev 14698)
+++ branches/dev-syncromind/property/inc/class.uilocation.inc.php
2016-02-05 08:39:12 UTC (rev 14699)
@@ -1424,6 +1424,7 @@
'allrows' => true,
'download_type' =>
'responsiblility_role'
),
+ 'allrows' => true,
);
$data = array
Modified: branches/dev-syncromind/property/inc/class.uirequest.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uirequest.inc.php
2016-02-04 19:31:41 UTC (rev 14698)
+++ branches/dev-syncromind/property/inc/class.uirequest.inc.php
2016-02-05 08:39:12 UTC (rev 14699)
@@ -677,6 +677,7 @@
'allrows' => true,
'list_descr' => true)),
'allrows' => true,
+ 'select_all' => !!$project_id,
'editor_action' => array(),
'field' => array()
)
Modified: branches/dev-syncromind/property/templates/base/lookup.entity.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/lookup.entity.xsl
2016-02-04 19:31:41 UTC (rev 14698)
+++ branches/dev-syncromind/property/templates/base/lookup.entity.xsl
2016-02-05 08:39:12 UTC (rev 14699)
@@ -353,6 +353,7 @@
var lang_ButtonText_columns = "<xsl:value-of
select="php:function('lang', 'columns')"/>";
// var download_url = '<xsl:value-of
select="download"/>';
+ var temp_buttons = [];
var exclude_colvis = [];
var editor_cols = [];
var editor_action = '<xsl:value-of select="editor_action"/>';
@@ -404,8 +405,10 @@
<xsl:when test="download">
,{
text: "<xsl:value-of select="php:function('lang', 'download')"/>",
+
className: 'download',
+
sUrl: '<xsl:value-of select="download"/>',
action: function (e, dt, node, config) {
-
var sUrl = '<xsl:value-of select="download"/>';
+
var sUrl = config.sUrl;
<![CDATA[
var oParams = {};
oParams.length = -1;
@@ -592,6 +595,7 @@
var options ={};
options.TableTools = JqueryPortico.buttons;
+ temp_buttons = JqueryPortico.buttons;
oTable =
JqueryPortico.inlineTableHelper("datatable-container", ajax_url,
JqueryPortico.columns, options);
]]>
/**
@@ -647,23 +651,38 @@
JqueryPortico.execute_ajax(ajax_url,
function(result)
{
+
+ /**
+ * Sigurd: queryPortico.buttons is
passed as reference - and destroyed in the "api.destroy();"
+ */
+ var buttons_def_temp =
JqueryPortico.buttons;
+ var buttons_def = [];
+ for (i=0;i<buttons_def_temp.length;i++)
+ {
+
buttons_def.push(buttons_def_temp[i]);
+ }
+
+
api = oTable.api();
api.destroy();
+
+ //Reset the destroyed values.
+ JqueryPortico.buttons = buttons_def;
$('#' +
result.datatable_def.container).empty();
$('#' +
result.datatable_def.container).append(result.datatable_head);
- var buttons_def = JqueryPortico.buttons;
var download =
result.datatable_def.download || false;
if(download)
{
for
(i=0;i<buttons_def.length;i++)
{
-//
if(buttons_def.buttons[i].extend == "download")
-// {
-//
buttons_def.buttons[i].sUrl = phpGWLink('index.php',download);
-// }
+
if(typeof(buttons_def[i].className) != 'undefined' && buttons_def[i].className
== "download")
+ {
+
buttons_def[i].sUrl = phpGWLink('index.php',download);
+ }
}
}
+console.log( buttons_def);
options ={};
options.TableTools = buttons_def;
var render;
| [Prev in Thread] | Current Thread | [Next in Thread] |