[Fmsystem-commits] [15489] clear state

[sigurdne]

Revision: 15489
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15489
Author:   sigurdne
Date:     2016-08-18 11:11:24 +0000 (Thu, 18 Aug 2016)
Log Message:
-----------
clear state

Modified Paths:
--------------
    trunk/phpgwapi/templates/base/datatable_jquery.xsl
    trunk/property/inc/class.bolocation.inc.php

Modified: trunk/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- trunk/phpgwapi/templates/base/datatable_jquery.xsl  2016-08-18 11:10:45 UTC 
(rev 15488)
+++ trunk/phpgwapi/templates/base/datatable_jquery.xsl  2016-08-18 11:11:24 UTC 
(rev 15489)
@@ -957,6 +957,12 @@
                        var table_url = 
JqueryPortico.parseURL(window.location.href);
                        var menuaction = 
table_url.searchObject.menuaction.replace(/\./g, '_');
 
+                       //clear state
+                       var clear_state = false;
+                       if(typeof(table_url.searchObject.clear_state) != 
'undefined' && table_url.searchObject.clear_state == 1)
+                       {
+                               clear_state = true;
+                       }
                        //uiocation
                        if(typeof(table_url.searchObject.type_id) != 
'undefined')
                        {
@@ -1038,7 +1044,10 @@
                                                $.each(params, function(index, 
value) {
                                                        if ( index == 
oControl.attr('name') )
                                                        {
-                                                               oControl.val( 
value );
+                                                               if (clear_state 
!== true)
+                                                               {
+                                                                       
oControl.val( value );
+                                                               }
                                                        }
                                                });
                                        });

Modified: trunk/property/inc/class.bolocation.inc.php
===================================================================
--- trunk/property/inc/class.bolocation.inc.php 2016-08-18 11:10:45 UTC (rev 
15488)
+++ trunk/property/inc/class.bolocation.inc.php 2016-08-18 11:11:24 UTC (rev 
15489)
@@ -653,6 +653,8 @@
                                                $lookup_functions[$j]['link'] 
.= ",location_code:'{$filter_location}',block_query:'{$block_query}'";
                                        }
 
+                                       $lookup_functions[$j]['link'] .= 
",clear_state:1";
+
                                        $_lookup_functions .= <<<JS
 
                                                function 
{$lookup_functions[$j]['name']}