[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17163] Stable: Merge 17160:17162 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17163] Stable: Merge 17160:17162 from trunk |
|
Date: |
Wed, 18 Oct 2017 04:24:55 -0400 (EDT) |
Revision: 17163
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17163
Author: sigurdne
Date: 2017-10-18 04:24:54 -0400 (Wed, 18 Oct 2017)
Log Message:
-----------
Stable: Merge 17160:17162 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php
branches/Version-2_0-branch/property/js/portico/project.edit.js
branches/Version-2_0-branch/property/js/portico/workorder.edit.js
branches/Version-2_0-branch/property/templates/base/project.xsl
branches/Version-2_0-branch/property/templates/base/workorder.xsl
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-10-18 08:23:17 UTC (rev 17162)
+++ branches/Version-2_0-branch 2017-10-18 08:24:54 UTC (rev 17163)
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,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159
\ 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,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162
\ No newline at end of property
Modified: branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php
2017-10-18 08:23:17 UTC (rev 17162)
+++ branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php
2017-10-18 08:24:54 UTC (rev 17163)
@@ -3219,8 +3219,10 @@
public function get_vendor_contract($vendor_id = 0, $selected =
0)
{
$contract_list =
$this->bocommon->get_vendor_contract($vendor_id, $selected);
-
- array_unshift($contract_list, array('id' => -1, 'name'
=> lang('outside contract')));
+ if($contract_list)
+ {
+ array_unshift($contract_list, array('id' => -1,
'name' => lang('outside contract')));
+ }
if($selected)
{
foreach ($contract_list as &$contract)
Modified: branches/Version-2_0-branch/property/js/portico/project.edit.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/project.edit.js
2017-10-18 08:23:17 UTC (rev 17162)
+++ branches/Version-2_0-branch/property/js/portico/project.edit.js
2017-10-18 08:24:54 UTC (rev 17163)
@@ -397,16 +397,18 @@
JqueryPortico.autocompleteHelper(strURL, 'b_account_name', 'b_account_id',
'b_account_container');
-window.on_location_updated = function ()
+window.on_location_updated = function (location_code)
{
+ location_code = location_code || $("#loc1").val();
+
+ get_location_exception(location_code);
+
if( $("#delivery_address").val() )
{
return;
}
- var loc1 = $("#loc1").val();
-
- var oArgs = {menuaction: 'property.uilocation.get_delivery_address',
loc1: loc1};
+ var oArgs = {menuaction: 'property.uilocation.get_delivery_address',
loc1: location_code};
var requestUrl = phpGWLink('index.php', oArgs, true);
$.ajax({
@@ -423,3 +425,38 @@
}
});
};
+
+window.get_location_exception = function (location_code)
+{
+
+ var oArgs = {menuaction: 'property.uilocation.get_location_exception',
location_code: location_code};
+ var requestUrl = phpGWLink('index.php', oArgs, true);
+
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: requestUrl,
+ success: function (data)
+ {
+ $("#message").html('');
+
+ if (data != null)
+ {
+ var htmlString = '';
+ var exceptions = data.location_exception;
+ $.each(exceptions, function (k, v)
+ {
+ htmlString += "<div class=\"error\">";
+ htmlString += v.severity + ": " +
v.category_text;
+ if(v.location_descr)
+ {
+ htmlString += "<br/>" +
v.location_descr;
+ }
+ htmlString += '</div>';
+
+ });
+ $("#message").html(htmlString);
+ }
+ }
+ });
+};
Modified: branches/Version-2_0-branch/property/js/portico/workorder.edit.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/workorder.edit.js
2017-10-18 08:23:17 UTC (rev 17162)
+++ branches/Version-2_0-branch/property/js/portico/workorder.edit.js
2017-10-18 08:24:54 UTC (rev 17163)
@@ -213,8 +213,7 @@
$("#vendor_contract_id").attr("data-validation", "required");
- htmlString = "<option value=''>" +
data.length + " kontrakter funnet</option>";
- htmlString += "<option
value='-1'>Utenfor rammeavtale</option>";
+ htmlString = "<option value=''>
kontrakter funnet</option>";
var obj = data;
$.each(obj, function (i)
@@ -663,16 +662,18 @@
});
}
-window.on_location_updated = function ()
+window.on_location_updated = function (location_code)
{
+ location_code = location_code || $("#loc1").val();
+
+ get_location_exception(location_code);
+
if( $("#delivery_address").val() )
{
return;
}
- var loc1 = $("#loc1").val();
-
- var oArgs = {menuaction: 'property.uilocation.get_delivery_address',
loc1: loc1};
+ var oArgs = {menuaction: 'property.uilocation.get_delivery_address',
loc1: location_code};
var requestUrl = phpGWLink('index.php', oArgs, true);
$.ajax({
@@ -688,4 +689,40 @@
}
}
});
+
};
+
+window.get_location_exception = function (location_code)
+{
+
+ var oArgs = {menuaction: 'property.uilocation.get_location_exception',
location_code: location_code};
+ var requestUrl = phpGWLink('index.php', oArgs, true);
+
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: requestUrl,
+ success: function (data)
+ {
+ $("#message").html('');
+
+ if (data != null)
+ {
+ var htmlString = '';
+ var exceptions = data.location_exception;
+ $.each(exceptions, function (k, v)
+ {
+ htmlString += "<div class=\"error\">";
+ htmlString += v.severity + ": " +
v.category_text;
+ if(v.location_descr)
+ {
+ htmlString += "<br/>" +
v.location_descr;
+ }
+ htmlString += '</div>';
+
+ });
+ $("#message").html(htmlString);
+ }
+ }
+ });
+};
Modified: branches/Version-2_0-branch/property/templates/base/project.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/project.xsl
2017-10-18 08:23:17 UTC (rev 17162)
+++ branches/Version-2_0-branch/property/templates/base/project.xsl
2017-10-18 08:24:54 UTC (rev 17163)
@@ -43,6 +43,8 @@
</dl>
</xsl:when>
</xsl:choose>
+ <div id="message" class='message'/>
+
<form ENCTYPE="multipart/form-data" method="post" id="form" name="form"
action="{form_action}" class= "pure-form pure-form-aligned">
<xsl:variable name="decimal_separator">
<xsl:value-of select="decimal_separator"/>
Modified: branches/Version-2_0-branch/property/templates/base/workorder.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/workorder.xsl
2017-10-18 08:23:17 UTC (rev 17162)
+++ branches/Version-2_0-branch/property/templates/base/workorder.xsl
2017-10-18 08:24:54 UTC (rev 17163)
@@ -100,6 +100,8 @@
</xsl:choose>
<table cellpadding="2" cellspacing="2" align="center">
<div id="receipt"></div>
+ <div id="message" class='message'/>
+
<input type="hidden" id = "lean" name="lean" value="{lean}"/>
<!--
<xsl:choose>
@@ -593,11 +595,21 @@
<xsl:value-of
select="php:function('lang', 'contract')"/>
</label>
<select id="vendor_contract_id"
name="values[contract_id]" class="pure-input-1-2">
- <xsl:if test="mode !=
'edit'">
- <xsl:attribute
name="disabled">
-
<xsl:text>disabled</xsl:text>
- </xsl:attribute>
- </xsl:if>
+ <xsl:choose>
+ <xsl:when
test="mode='edit'">
+ <xsl:if
test="count(contract_list/options) > 0">
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
</xsl:if>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:attribute name="disabled">
+
<xsl:text>disabled</xsl:text>
+
</xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+
<option value="">
<xsl:value-of
select="php:function('lang', 'select')"/>
</option>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17163] Stable: Merge 17160:17162 from trunk,
sigurdne <=