[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17065] Stable: Merge 17061:17064 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17065] Stable: Merge 17061:17064 from trunk |
|
Date: |
Tue, 12 Sep 2017 05:41:47 -0400 (EDT) |
Revision: 17065
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17065
Author: sigurdne
Date: 2017-09-12 05:41:47 -0400 (Tue, 12 Sep 2017)
Log Message:
-----------
Stable: Merge 17061:17064 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/eventplannerfrontend/templates/base/css/base.css
branches/Version-2_0-branch/phpgwapi/templates/frontend/css/frontend.css
branches/Version-2_0-branch/property/inc/class.soentity.inc.php
branches/Version-2_0-branch/property/inc/class.soproject.inc.php
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-09-12 09:39:56 UTC (rev 17064)
+++ branches/Version-2_0-branch 2017-09-12 09:41:47 UTC (rev 17065)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16846
/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,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060
\ 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,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064
\ No newline at end of property
Modified:
branches/Version-2_0-branch/eventplannerfrontend/templates/base/css/base.css
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/templates/base/css/base.css
2017-09-12 09:39:56 UTC (rev 17064)
+++
branches/Version-2_0-branch/eventplannerfrontend/templates/base/css/base.css
2017-09-12 09:41:47 UTC (rev 17065)
@@ -1,8 +1,11 @@
-#organsation_select
-{
- position: absolute;
- z-index: 10;
- background: white;
- top: 0;
- right: 0
-}
\ No newline at end of file
+#organsation_select{
+ background: #DF0101;
+ position:fixed;
+ padding-top:0.5em;
+ padding-right:0.5em;
+ z-index:100;
+}
+
+#organsation_select > form > label{
+ color:white
+}
Modified:
branches/Version-2_0-branch/phpgwapi/templates/frontend/css/frontend.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/frontend/css/frontend.css
2017-09-12 09:39:56 UTC (rev 17064)
+++ branches/Version-2_0-branch/phpgwapi/templates/frontend/css/frontend.css
2017-09-12 09:41:47 UTC (rev 17065)
@@ -478,4 +478,11 @@
input {
font-size: 16px;
}
-}
\ No newline at end of file
+}
+
+
+#hamburger{
+
+ position:fixed;
+}
+
Modified: branches/Version-2_0-branch/property/inc/class.soentity.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.soentity.inc.php
2017-09-12 09:39:56 UTC (rev 17064)
+++ branches/Version-2_0-branch/property/inc/class.soentity.inc.php
2017-09-12 09:41:47 UTC (rev 17065)
@@ -709,6 +709,7 @@
while ($this->db->next_record())
{
+ $_column_name =
$this->db->f('column_name');
switch
($this->db->f('datatype'))
{
case 'V':
@@ -716,7 +717,7 @@
case 'T':
if
(!$criteria_id)
{
-
$_querymethod[] = "json_representation->>'". $this->db->f('column_name') ."'
{$this->like} '%{$query}%'";
+
$_querymethod[] = "json_representation->>'{$_column_name}' {$this->like}
'%{$query}%'";
$__querymethod = array(); // remove block
}
break;
@@ -724,7 +725,7 @@
if
(!$criteria_id)
{
// from
filter
-
$_querymethod[] = "$entity_table." . $this->db->f('column_name') . "
{$this->like} '%,{$query},%'";
+//
$_querymethod[] = "$entity_table.{$_column_name} {$this->like} '%,{$query},%'";
$__querymethod = array(); // remove block
// from
text-search
$_filter_choise = "WHERE (phpgw_cust_choice.location_id =" .
(int)$this->db->f('location_id')
@@ -734,7 +735,7 @@
$this->db2->query("SELECT phpgw_cust_choice.id FROM phpgw_cust_choice
{$_filter_choise}", __LINE__, __FILE__);
while
($this->db2->next_record())
{
-
$_querymethod[] = "json_representation->>'". $this->db->f('column_name') ."'
{$this->like} '%,{$query},%'";
+
$_querymethod[] = "json_representation->>'{$_column_name}' {$this->like}
'%,{$query},%'";
}
}
break;
@@ -750,7 +751,7 @@
$__filter_choise = array();
while
($this->db2->next_record())
{
-
$_querymethod[] = "CAST( json_representation->>'". $this->db->f('column_name')
."' AS integer) = " .(int)$this->db2->f('id');
+
$_querymethod[] = "(NULLIF(json_representation->>'{$_column_name}',
'')::integer IS NOT NULL AND CAST( json_representation->>'{$_column_name}' AS
integer) = " .(int)$this->db2->f('id') . ')';
}
$__querymethod = array(); // remove block
}
@@ -759,7 +760,7 @@
if
(ctype_digit($query) && !$criteria_id)
{
//
$_querymethod[] = "CAST( json_representation->>'". $this->db->f('column_name')
."' AS integer) = " .(int)$query;
-
$_querymethod[] = "CAST(json_representation->>'". $this->db->f('column_name') .
"'AS text) {$this->like} '" .(int)$query . "%'";
+
$_querymethod[] = "CAST(json_representation->>'{$_column_name}'AS text)
{$this->like} '" .(int)$query . "%'";
$__querymethod = array(); // remove block
}
break;
@@ -768,9 +769,11 @@
{
$this->db2->query("SELECT id FROM fm_vendor WHERE fm_vendor.org_name
{$this->like} '%{$query}%'", __LINE__, __FILE__);
$__filter_choise = array();
+
$_column_name = $this->db->f('column_name');
while
($this->db2->next_record())
{
-
$_querymethod[] = "CAST( json_representation->>'". $this->db->f('column_name')
."' AS integer) = " .(int)$this->db2->f('id');
+//
$_querymethod[] = "CAST( json_representation->>'". $this->db->f('column_name')
."' AS integer) = " .(int)$this->db2->f('id');
+
$_querymethod[] = "(NULLIF(json_representation->>'{$_column_name}',
'')::integer IS NOT NULL AND CAST( json_representation->>'{$_column_name}' AS
integer) = " .(int)$this->db2->f('id') . ')';
}
$__querymethod = array(); // remove block
@@ -783,7 +786,8 @@
$__filter_choise = array();
while
($this->db2->next_record())
{
-
$_querymethod[] = "CAST( json_representation->>'". $this->db->f('column_name')
."' AS integer) = " .(int)$this->db2->f('id');
+//
$_querymethod[] = "CAST( json_representation->>'". $this->db->f('column_name')
."' AS integer) = " .(int)$this->db2->f('id');
+
$_querymethod[] = "(NULLIF(json_representation->>'{$_column_name}',
'')::integer IS NOT NULL AND CAST( json_representation->>'{$_column_name}' AS
integer) = " .(int)$this->db2->f('id') . ')';
}
$__querymethod = array(); // remove block
@@ -796,7 +800,8 @@
$__filter_choise = array();
while
($this->db2->next_record())
{
-
$_querymethod[] = "CAST( json_representation->>'". $this->db->f('column_name')
."' AS integer) = " .(int)$this->db2->f('id');
+//
$_querymethod[] = "CAST( json_representation->>'". $this->db->f('column_name')
."' AS integer) = " .(int)$this->db2->f('id');
+
$_querymethod[] = "(NULLIF(json_representation->>'{$_column_name}',
'')::integer IS NOT NULL AND CAST( json_representation->>'{$_column_name}' AS
integer) = " .(int)$this->db2->f('id') . ')';
}
$__querymethod = array(); // remove block
}
@@ -804,7 +809,7 @@
default:
if
(!$criteria_id)
{
-
$_querymethod[] = "json_representation->>'". $this->db->f('column_name') ."' =
'{$query}'";
+
$_querymethod[] = "json_representation->>'{$_column_name}' = '{$query}'";
$__querymethod = array(); // remove block
}
}
Modified: branches/Version-2_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.soproject.inc.php
2017-09-12 09:39:56 UTC (rev 17064)
+++ branches/Version-2_0-branch/property/inc/class.soproject.inc.php
2017-09-12 09:41:47 UTC (rev 17065)
@@ -657,16 +657,26 @@
}
else
{
- if ($criteria[0]['type'] == int)
+ if ($criteria[0]['type'] ==
'int')
{
$_query = (int)$query;
+
+
if($criteria[0]['matchtype'] == 'like')
+ {
+ // as text
+ $querymethod =
"{$where} cast({$criteria[0]['field']} as text)
{$matchtypes[$criteria[0]['matchtype']]}
{$criteria[0]['front']}{$_query}{$criteria[0]['back']}";
+ }
+ else
+ {
+ $querymethod =
"{$where} {$criteria[0]['field']} {$matchtypes[$criteria[0]['matchtype']]}
{$criteria[0]['front']}{$_query}{$criteria[0]['back']}";
+ }
}
else
{
$_query = $query;
+ $querymethod =
"{$where} {$criteria[0]['field']} {$matchtypes[$criteria[0]['matchtype']]}
{$criteria[0]['front']}{$_query}{$criteria[0]['back']}";
}
- $querymethod = "{$where}
{$criteria[0]['field']} {$matchtypes[$criteria[0]['matchtype']]}
{$criteria[0]['front']}{$_query}{$criteria[0]['back']}";
}
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17065] Stable: Merge 17061:17064 from trunk,
sigurdne <=