[Fmsystem-commits] [16234] Stable: Merge 16232:16233 from trunk

[sigurdne]

Revision: 16234
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16234
Author:   sigurdne
Date:     2017-02-02 05:52:56 -0500 (Thu, 02 Feb 2017)
Log Message:
-----------
Stable: Merge 16232:16233 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/property/inc/class.boworkorder.inc.php
    branches/Version-2_0-branch/property/inc/class.soworkorder.inc.php

Property Changed:
----------------
    branches/Version-2_0-branch/

Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-02-02 10:51:30 UTC (rev 16233)
+++ branches/Version-2_0-branch 2017-02-02 10:52:56 UTC (rev 16234)

Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
 /branches/dev-syncromind:13653
 /branches/dev-syncromind-2:14933-16188
 /branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233
\ No newline at end of property
Modified: branches/Version-2_0-branch/property/inc/class.boworkorder.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.boworkorder.inc.php  
2017-02-02 10:51:30 UTC (rev 16233)
+++ branches/Version-2_0-branch/property/inc/class.boworkorder.inc.php  
2017-02-02 10:52:56 UTC (rev 16234)
@@ -353,9 +353,9 @@
                                (
                                'field' => 'fm_workorder.id',
                                'type' => 'bigint',
-                               'matchtype' => 'exact',
+                               'matchtype' => 'like',
                                'front' => "'",
-                               'back' => "'"
+                               'back' => "%'",
                        );
                        $criteria[4] = array
                                (

Modified: branches/Version-2_0-branch/property/inc/class.soworkorder.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.soworkorder.inc.php  
2017-02-02 10:51:30 UTC (rev 16233)
+++ branches/Version-2_0-branch/property/inc/class.soworkorder.inc.php  
2017-02-02 10:52:56 UTC (rev 16234)
@@ -732,14 +732,24 @@
                                                $_querymethod = array();
                                                foreach ($criteria as 
$field_info)
                                                {
-                                                       if ($field_info['type'] 
== int)
+                                                       if ($field_info['type'] 
== 'int')
                                                        {
                                                                $_query = 
(int)$query;
                                                        }
                                                        else if 
($field_info['type'] == 'bigint' && !ctype_digit($query))
                                                        {
+
                                                                $_query = 0;
                                                        }
+                                                       else if 
($field_info['type'] == 'bigint' && ctype_digit($query))
+                                                       {
+                                                               $_query = 
$query;
+                                                               
if($field_info['matchtype'] == 'like')
+                                                               {
+                                                                       
$_querymethod[] = " cast({$field_info['field']} as text) 
{$matchtypes[$field_info['matchtype']]} 
{$field_info['front']}{$_query}{$field_info['back']}";
+                                                                       
continue;
+                                                               }
+                                                       }
                                                        else
                                                        {
                                                                $_query = 
$query;