[Fmsystem-commits] [15295] property: validation

[sigurdne]

Revision: 15295
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15295
Author:   sigurdne
Date:     2016-06-16 10:29:03 +0000 (Thu, 16 Jun 2016)
Log Message:
-----------
property: validation

Modified Paths:
--------------
    trunk/property/inc/class.uiproject.inc.php
    trunk/property/templates/base/project.xsl

Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php  2016-06-16 07:58:34 UTC (rev 
15294)
+++ trunk/property/inc/class.uiproject.inc.php  2016-06-16 10:29:03 UTC (rev 
15295)
@@ -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: trunk/property/templates/base/project.xsl
===================================================================
--- trunk/property/templates/base/project.xsl   2016-06-16 07:58:34 UTC (rev 
15294)
+++ trunk/property/templates/base/project.xsl   2016-06-16 10:29:03 UTC (rev 
15295)
@@ -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 &gt; 0 and not(check_for_budget &gt; 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">