[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15296] Stable: Merge 15294:15295 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [15296] Stable: Merge 15294:15295 from trunk |
|
Date: |
Thu, 16 Jun 2016 10:30:24 +0000 (UTC) |
Revision: 15296
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15296
Author: sigurdne
Date: 2016-06-16 10:30:24 +0000 (Thu, 16 Jun 2016)
Log Message:
-----------
Stable: Merge 15294:15295 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
branches/Version-2_0-branch/property/templates/base/project.xsl
Property Changed:
----------------
branches/Version-2_0-branch/
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/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
+ /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/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
Modified: branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
2016-06-16 10:29:03 UTC (rev 15295)
+++ branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
2016-06-16 10:30:24 UTC (rev 15296)
@@ -733,7 +733,7 @@
$values = phpgw::get_var('values');
$values_attribute = phpgw::get_var('values_attribute');
// $values['external_project_id'] =
phpgw::get_var('external_project_id');
- $values['ecodimb'] = phpgw::get_var('ecodimb');
+// $values['ecodimb'] = phpgw::get_var('ecodimb');
$values['b_account_id'] =
phpgw::get_var('b_account_id', 'int', 'POST');
$values['b_account_name'] =
phpgw::get_var('b_account_name', 'string', 'POST');
$values['contact_id'] = phpgw::get_var('contact',
'int', 'POST');
Modified: branches/Version-2_0-branch/property/templates/base/project.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/project.xsl
2016-06-16 10:29:03 UTC (rev 15295)
+++ branches/Version-2_0-branch/property/templates/base/project.xsl
2016-06-16 10:30:24 UTC (rev 15296)
@@ -363,14 +363,14 @@
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
+ <xsl:attribute
name="data-validation-error-msg">
+
<xsl:value-of select="$lang_dimb"/>
+ </xsl:attribute>
</xsl:when>
<xsl:otherwise>
<xsl:attribute
name="disabled">
<xsl:text>disabled</xsl:text>
</xsl:attribute>
- <xsl:attribute
name="data-validation-error-msg">
-
<xsl:value-of select="$lang_dimb"/>
- </xsl:attribute>
</xsl:otherwise>
</xsl:choose>
</input>
@@ -405,8 +405,11 @@
</div>
</xsl:if>
<div class="pure-control-group">
+ <xsl:variable name="lang_budget">
+ <xsl:value-of
select="php:function('lang', 'budget')"/>
+ </xsl:variable>
<label for="name">
- <xsl:value-of
select="php:function('lang', 'budget')"/>
+ <xsl:value-of
select="$lang_budget"/>
</label>
<div class="pure-custom">
<div>
@@ -419,11 +422,17 @@
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
+
<xsl:attribute name="data-validation-error-msg">
+
<xsl:value-of select="$lang_budget"/>
+
</xsl:attribute>
</xsl:when>
<xsl:when test="value_project_id > 0 and not(check_for_budget > 0) and
mode='edit'">
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
+
<xsl:attribute name="data-validation-error-msg">
+
<xsl:value-of select="$lang_budget"/>
+
</xsl:attribute>
</xsl:when>
<xsl:otherwise>
<xsl:attribute name="data-validation-optional">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15296] Stable: Merge 15294:15295 from trunk,
sigurdne <=