[Fmsystem-commits] [17330] helpdesk: show filter group as default

[sigurdne]

Revision: 17330
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17330
Author:   sigurdne
Date:     2017-11-18 11:24:27 -0500 (Sat, 18 Nov 2017)
Log Message:
-----------
helpdesk: show filter group as default

Modified Paths:
--------------
    trunk/helpdesk/inc/class.uitts.inc.php
    trunk/phpgwapi/templates/base/datatable_jquery.xsl

Modified: trunk/helpdesk/inc/class.uitts.inc.php
===================================================================
--- trunk/helpdesk/inc/class.uitts.inc.php      2017-11-18 16:05:38 UTC (rev 
17329)
+++ trunk/helpdesk/inc/class.uitts.inc.php      2017-11-18 16:24:27 UTC (rev 
17330)
@@ -896,6 +896,7 @@
                                'datatable_name' => $appname . ': ' . 
$function_msg,
                                'form' => array(
                                        'toolbar' => array(
+                                               'show_filter_group' => true,
                                                'item' => array(
                                                        array
                                                                (

Modified: trunk/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- trunk/phpgwapi/templates/base/datatable_jquery.xsl  2017-11-18 16:05:38 UTC 
(rev 17329)
+++ trunk/phpgwapi/templates/base/datatable_jquery.xsl  2017-11-18 16:24:27 UTC 
(rev 17330)
@@ -31,8 +31,13 @@
 
 <xsl:template name="datatable">
        <script type="text/javascript">
-                       var number_of_toolbar_items = 0;
-                       var filter_selects = {};
+               var show_filter_group = false;
+               <xsl:if test="form/toolbar/show_filter_group = '1'">
+                       show_filter_group = true;
+               </xsl:if>
+
+               var number_of_toolbar_items = 0;
+               var filter_selects = {};
        </script>
        <xsl:call-template name="jquery_phpgw_i18n"/>
        <xsl:apply-templates select="form" />
@@ -1267,7 +1272,7 @@
                                });
                        }
 
-                       if(number_of_toolbar_items < 4)
+                       if(number_of_toolbar_items < 5 || show_filter_group == 
true)
                        {
                                $('#header1').prop("checked", true);
                        }