[Fmsystem-commits] [17141] api/helpdesk: prepare for muliple select

[sigurdne]

Revision: 17141
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17141
Author:   sigurdne
Date:     2017-10-05 14:38:39 -0400 (Thu, 05 Oct 2017)
Log Message:
-----------
api/helpdesk: prepare for muliple select

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-10-05 13:18:00 UTC (rev 
17140)
+++ trunk/helpdesk/inc/class.uitts.inc.php      2017-10-05 18:38:39 UTC (rev 
17141)
@@ -739,7 +739,9 @@
                                        'selected'      => ((int)$this->user_id 
< 0  || (int)$filter_tts_assigned_to_me == 1) ? 1 : 0));
 
                                array_unshift($values_combo_box[4], array('id' 
=> '', 'name' => lang('assigned to')));
-                               $combos[] = array('type' => 'filter',
+                               $combos[] = array(
+                                       'type' => 'filter',
+//                                     'multiple'      => true,
                                        'name' => 'user_id',
                                        'extra' => '',
                                        'text' => lang('assigned to'),

Modified: trunk/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- trunk/phpgwapi/templates/base/datatable_jquery.xsl  2017-10-05 13:18:00 UTC 
(rev 17140)
+++ trunk/phpgwapi/templates/base/datatable_jquery.xsl  2017-10-05 18:38:39 UTC 
(rev 17141)
@@ -235,6 +235,11 @@
                                                                                
filter_selects['<xsl:value-of select="text"/>'] = '<xsl:value-of 
select="$name"/>';
                                                                        
</script>
                                                                        <select 
id="{$name}" name="{$name}" class="pure-u-24-24">
+                                                                               
<xsl:if test="multiple">
+                                                                               
        <xsl:attribute name="multiple">
+                                                                               
                <xsl:text>true</xsl:text>
+                                                                               
        </xsl:attribute>
+                                                                               
</xsl:if>
                                                                                
<xsl:attribute name="title">
                                                                                
        <xsl:value-of select="phpgw:conditional(not(text), '', text)"/>
                                                                                
</xsl:attribute>
@@ -1303,11 +1308,26 @@
 
                <xsl:for-each select="//form/toolbar/item">
                        <xsl:if test="type = 'filter'">
-                               $('select#<xsl:value-of 
select="name"/>').change( function()
-                               {
-                               <xsl:value-of select="extra"/>
-                               filterData('<xsl:value-of select="name"/>', 
$(this).val());
-                               });
+                               <xsl:choose>
+                                       <xsl:when test="multiple">
+                                               $('select#<xsl:value-of 
select="name"/>').change( function()
+                                               {
+                                                       var search = [];
+                                                       
$.each($('select#<xsl:value-of select="name"/> option:selected'), function(){
+                                                                 
search.push($(this).val());
+                                                       });
+                                                       <xsl:value-of 
select="extra"/>
+                                                       
filterData('<xsl:value-of select="name"/>', search);
+                                               });
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               $('select#<xsl:value-of 
select="name"/>').change( function()
+                                               {
+                                               <xsl:value-of select="extra"/>
+                                               filterData('<xsl:value-of 
select="name"/>', $(this).val());
+                                               });
+                                       </xsl:otherwise>
+                               </xsl:choose>
                        </xsl:if>
                        <xsl:if test="type = 'date-picker'">
                                var previous_<xsl:value-of select="id"/>;