|
| From: | sigurdne |
| Subject: | [Fmsystem-commits] [16252] Stable: Merge 16249:16251 from trunk |
| Date: | Mon, 6 Feb 2017 03:55:41 -0500 (EST) |
Revision: 16252
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16252
Author: sigurdne
Date: 2017-02-06 03:55:40 -0500 (Mon, 06 Feb 2017)
Log Message:
-----------
Stable: Merge 16249:16251 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
branches/Version-2_0-branch/property/inc/class.soworkorder.inc.php
branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-02-06 08:52:45 UTC (rev 16251)
+++ branches/Version-2_0-branch 2017-02-06 08:55:40 UTC (rev 16252)
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,16233,16235,16237,16239-16240,16242,16244-16246,16248
\ 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
\ No newline at end of property
Modified:
branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
2017-02-06 08:52:45 UTC (rev 16251)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
2017-02-06 08:55:40 UTC (rev 16252)
@@ -108,17 +108,17 @@
</tr>
</thead-->
<tbody>
+ <tr>
+ <td>
<xsl:for-each select="item">
<script type="text/javascript">
number_of_toolbar_items
+= 1;
</script>
- <tr>
<xsl:variable
name="filter_key" select="concat('filter_', name)"/>
<xsl:variable
name="filter_key_name" select="concat(concat('filter_', name), '_name')"/>
<xsl:variable
name="filter_key_id" select="concat(concat('filter_', name), '_id')"/>
- <td>
- <xsl:if
test="name">
+ <!--xsl:if
test="name">
<label>
<xsl:attribute name="for">
<xsl:value-of select="phpgw:conditional(not(name), '', name)"/>
@@ -125,22 +125,16 @@
</xsl:attribute>
<xsl:value-of select="phpgw:conditional(not(text), '', text)"/>
</label>
- </xsl:if>
- </td>
+ </xsl:if-->
<xsl:choose>
<xsl:when
test="type = 'date-picker'">
- <td
valign="top">
-
<div>
<input id="filter_{name}" name="filter_{name}" value="{value}"
type="text">
<xsl:attribute name="title">
<xsl:value-of select="phpgw:conditional(not(text), '',
text)"/>
</xsl:attribute>
</input>
-
</div>
- </td>
</xsl:when>
<xsl:when
test="type = 'autocomplete'">
- <td
class="auto">
<div class="auto">
<input id="filter_{name}_name" name="{name}_name" type="text">
<xsl:attribute name="value">
@@ -227,10 +221,8 @@
}
});
</script>
- </td>
</xsl:when>
<xsl:when
test="type = 'filter'">
- <td
valign="top">
<xsl:variable name="name">
<xsl:value-of select="name"/>
</xsl:variable>
@@ -273,10 +265,8 @@
</xsl:choose>
</xsl:for-each>
</select>
- </td>
</xsl:when>
<xsl:when
test="type = 'link'">
- <td
valign="top">
<input type="button" class="pure-button pure-button-primary">
<xsl:choose>
<xsl:when test="onclick">
@@ -292,10 +282,8 @@
<xsl:value-of select="value"/>
</xsl:attribute>
</input>
- </td>
</xsl:when>
<xsl:when
test="type = 'hidden'">
- <td
valign="top">
<input>
<xsl:attribute name="type">
<xsl:value-of select="phpgw:conditional(not(type), '', type)"/>
@@ -310,19 +298,15 @@
<xsl:value-of select="phpgw:conditional(not(value), '',
value)"/>
</xsl:attribute>
</input>
- </td>
</xsl:when>
<xsl:when
test="type = 'label'">
- <td
valign="top">
<label>
<xsl:attribute name="id">
<xsl:value-of select="phpgw:conditional(not(id), '', id)"/>
</xsl:attribute>
</label>
- </td>
</xsl:when>
<xsl:otherwise>
- <td
valign="top">
<input id="innertoolbar_{name}">
<xsl:attribute name="type">
<xsl:value-of select="phpgw:conditional(not(type), '', type)"/>
@@ -346,11 +330,11 @@
<xsl:value-of select="phpgw:conditional(not(checked), '',
checked)"/>
</xsl:attribute>
</input>
- </td>
</xsl:otherwise>
</xsl:choose>
- </tr>
</xsl:for-each>
+ </td>
+ </tr>
</tbody>
</table>
</div>
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-06 08:52:45 UTC (rev 16251)
+++ branches/Version-2_0-branch/property/inc/class.soworkorder.inc.php
2017-02-06 08:55:40 UTC (rev 16252)
@@ -736,12 +736,12 @@
{
$_query =
(int)$query;
}
- else if
($field_info['type'] == 'bigint' && !ctype_digit($query))
+ else if
($field_info['type'] == 'bigint' && $field_info['matchtype'] != 'like')
{
$_query = 0;
}
- else if
($field_info['type'] == 'bigint' && ctype_digit($query))
+ else if
($field_info['type'] == 'bigint' && $field_info['matchtype'] == 'like')
{
$_query =
$query;
if($field_info['matchtype'] == 'like')
@@ -767,10 +767,16 @@
{
$_query = (int)$query;
}
- else if ($criteria[0]['type']
== 'bigint' && !ctype_digit($query))
+ else if ($criteria[0]['type']
== 'bigint' && $field_info['matchtype'] == 'like')
{
+ $_query = $query;
+ $_querymethod[] = "
cast({$field_info['field']} as text) {$matchtypes[$field_info['matchtype']]}
{$field_info['front']}{$_query}{$field_info['back']}";
$_query = 0;
}
+ else if ($criteria[0]['type']
== 'bigint' && $field_info['matchtype'] != 'like')
+ {
+ $_query = 0;
+ }
else
{
$_query = $query;
Modified: branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
2017-02-06 08:52:45 UTC (rev 16251)
+++ branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
2017-02-06 08:55:40 UTC (rev 16252)
@@ -1511,7 +1511,9 @@
if (!$_status)
{
- throw new Exception('status on
ordered not given in config');
+ // throw new Exception('status on
ordered not given in config');
+
phpgwapi_cache::message_set("Automatisk endring av status for bestilt er ikke
konfigurert", 'error');
+
}
if (!is_object($GLOBALS['phpgw']->send))
@@ -1561,20 +1563,22 @@
$historylog->add('MS',
$workorder_id, $to_sms_phone);
}
- try
+ if($_status)
{
-
execMethod('property.soworkorder.update_status', array('order_id' =>
$workorder_id,
- 'status' => $_status));
- }
- catch (Exception $e)
- {
- if ($e)
+ try
{
- throw $e;
+
execMethod('property.soworkorder.update_status', array('order_id' =>
$workorder_id,
+ 'status' =>
$_status));
}
+ catch (Exception $e)
+ {
+ if ($e)
+ {
+ throw $e;
+ }
+ }
}
-
//Sigurd: Consider remove
/*
if(
$this->boworkorder->order_sent_adress )
@@ -3486,7 +3490,7 @@
if (!$_status)
{
- throw new Exception('status on ordered not
given in config');
+ phpgwapi_cache::message_set("Automatisk endring
av status for bestilt er ikke konfigurert", 'error');
}
try
@@ -3505,17 +3509,20 @@
}
}
- try
+ if($_status)
{
-
execMethod('property.soworkorder.update_status', array('order_id' =>
$workorder_id,
- 'status' => $_status));
- }
- catch (Exception $e)
- {
- if ($e)
+ try
{
- throw $e;
+
execMethod('property.soworkorder.update_status', array('order_id' =>
$workorder_id,
+ 'status' => $_status));
}
+ catch (Exception $e)
+ {
+ if ($e)
+ {
+ throw $e;
+ }
+ }
}
$_attachment_log = $attachment_log ?
"::$attachment_log" : '';
| [Prev in Thread] | Current Thread | [Next in Thread] |