[Fmsystem-commits] [16242] rental: validation

[sigurdne]

Revision: 16242
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16242
Author:   sigurdne
Date:     2017-02-03 06:26:29 -0500 (Fri, 03 Feb 2017)
Log Message:
-----------
rental: validation

Modified Paths:
--------------
    trunk/rental/js/rental/party.edit.js
    trunk/rental/templates/base/party.xsl

Modified: trunk/rental/js/rental/party.edit.js
===================================================================
--- trunk/rental/js/rental/party.edit.js        2017-02-02 19:21:07 UTC (rev 
16241)
+++ trunk/rental/js/rental/party.edit.js        2017-02-03 11:26:29 UTC (rev 
16242)
@@ -108,7 +108,7 @@
                        var lastname = $('#lastname').val();
                        var company_name = $('#company_name').val();
                        var department = $('#department').val();
-                       if ((firstname != "" && lastname != "") || 
(company_name != "" && department != ""))
+                       if ((firstname != "" && lastname != "") || 
(company_name != ""))// && department != ""))
                        {
                                v = true;
                        }

Modified: trunk/rental/templates/base/party.xsl
===================================================================
--- trunk/rental/templates/base/party.xsl       2017-02-02 19:21:07 UTC (rev 
16241)
+++ trunk/rental/templates/base/party.xsl       2017-02-03 11:26:29 UTC (rev 
16242)
@@ -31,9 +31,9 @@
                <xsl:variable name="form_action">
                        <xsl:value-of select="form_action"/>
                </xsl:variable>
-       <script type="text/javascript">
-               var lang = <xsl:value-of select="php:function('js_lang', 'Name 
or company is required')"/>;
-       </script>
+               <script type="text/javascript">
+                       var lang = <xsl:value-of 
select="php:function('js_lang', 'Name or company is required')"/>;
+               </script>
 
                <form id="form" name="form" method="post" 
action="{$form_action}" class="pure-form pure-form-aligned">
                        <div id="tab-content">
@@ -94,10 +94,6 @@
                                                                <xsl:value-of 
select="php:function('lang', 'department')"/>
                                                        </label>
                                                        <input type="text" 
id="department" name="department" value="{value_department}">
-                                                               <xsl:attribute 
name="data-validation">
-                                                                       
<xsl:text>naming</xsl:text>
-                                                               </xsl:attribute>
-
                                                        </input>
                                                </div>
                                                <div class="pure-control-group">
@@ -154,8 +150,11 @@
                                                        </label>
                                                        <input type="text" 
name="email" id="email" value="{value_email}">
                                                                <xsl:attribute 
name="data-validation">
-                                                                       
<xsl:text>required</xsl:text>
+                                                                       
<xsl:text>email</xsl:text>
                                                                </xsl:attribute>
+                                                               <xsl:attribute 
name="data-validation-optional">
+                                                                       
<xsl:text>true</xsl:text>
+                                                               </xsl:attribute>
                                                        </input>
                                                        <xsl:choose>
                                                                <xsl:when 
test="valid_email = 1">