[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14805] validation
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14805] validation |
|
Date: |
Thu, 03 Mar 2016 12:04:20 +0000 |
Revision: 14805
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14805
Author: sigurdne
Date: 2016-03-03 12:04:19 +0000 (Thu, 03 Mar 2016)
Log Message:
-----------
validation
Modified Paths:
--------------
trunk/rental/js/rental/party.edit.js
trunk/rental/setup/phpgw_no.lang
trunk/rental/templates/base/party.xsl
Modified: trunk/rental/js/rental/party.edit.js
===================================================================
--- trunk/rental/js/rental/party.edit.js 2016-03-03 08:27:59 UTC (rev
14804)
+++ trunk/rental/js/rental/party.edit.js 2016-03-03 12:04:19 UTC (rev
14805)
@@ -99,6 +99,25 @@
}
});
});
+ $.formUtils.addValidator({
+ name: 'naming',
+ validatorFunction: function (value, $el, config, languaje,
$form)
+ {
+ var v = false;
+ var firstname = $('#firstname').val();
+ var lastname = $('#lastname').val();
+ var company_name = $('#company_name').val();
+ var department = $('#department').val();
+ if ((firstname != "" && lastname != "") ||
(company_name != "" && department != ""))
+ {
+ v = true;
+ }
+ return v;
+ },
+ errorMessage: lang['Name or company is required'],
+ errorMessageKey: ''
+ });
+
});
function filterDataContract(param, value)
Modified: trunk/rental/setup/phpgw_no.lang
===================================================================
--- trunk/rental/setup/phpgw_no.lang 2016-03-03 08:27:59 UTC (rev 14804)
+++ trunk/rental/setup/phpgw_no.lang 2016-03-03 12:04:19 UTC (rev 14805)
@@ -615,4 +615,5 @@
list %1 rental no Alle %1
new rental no Ny
download excel export bk rental no Last ned Excel-eksport BK
-serial_number rental no Serienummer
\ No newline at end of file
+serial_number rental no Serienummer
+Name or company is required rental no Navn på person eller navn på
foretak er obligatorisk
\ No newline at end of file
Modified: trunk/rental/templates/base/party.xsl
===================================================================
--- trunk/rental/templates/base/party.xsl 2016-03-03 08:27:59 UTC (rev
14804)
+++ trunk/rental/templates/base/party.xsl 2016-03-03 12:04:19 UTC (rev
14805)
@@ -31,6 +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>
<form id="form" name="form" method="post"
action="{$form_action}" class="pure-form pure-form-aligned">
<div id="tab-content">
@@ -41,16 +44,20 @@
<label>
<xsl:value-of
select="php:function('lang', 'identifier')"/>
</label>
- <input type="text"
name="identifier" value="{value_identifier}"></input>
+ <input type="text"
name="identifier" value="{value_identifier}">
+ <xsl:attribute
name="data-validation">
+
<xsl:text>required</xsl:text>
+ </xsl:attribute>
+ </input>
<input type="hidden"
name="id" value="{party_id}"/>
</div>
<div class="pure-control-group">
<label>
<xsl:value-of
select="php:function('lang', 'firstname')"/>
</label>
- <input type="text"
name="firstname" value="{value_firstname}">
+ <input type="text"
id="firstname" name="firstname" value="{value_firstname}">
<xsl:attribute
name="data-validation">
-
<xsl:text>required</xsl:text>
+
<xsl:text>naming</xsl:text>
</xsl:attribute>
</input>
</div>
@@ -58,7 +65,12 @@
<label>
<xsl:value-of
select="php:function('lang', 'lastname')"/>
</label>
- <input type="text"
name="lastname" value="{value_lastname}"></input>
+ <input type="text"
id="lastname" name="lastname" value="{value_lastname}">
+ <xsl:attribute
name="data-validation">
+
<xsl:text>naming</xsl:text>
+ </xsl:attribute>
+
+ </input>
</div>
<div class="pure-control-group">
<label>
@@ -70,13 +82,23 @@
<label>
<xsl:value-of
select="php:function('lang', 'company')"/>
</label>
- <input type="text"
id="company_name" name="company_name" value="{value_company}"></input>
+ <input type="text"
id="company_name" name="company_name" value="{value_company}">
+ <xsl:attribute
name="data-validation">
+
<xsl:text>naming</xsl:text>
+ </xsl:attribute>
+
+ </input>
</div>
<div class="pure-control-group">
<label>
<xsl:value-of
select="php:function('lang', 'department')"/>
</label>
- <input type="text"
id="department" name="department" value="{value_department}"></input>
+ <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">
<label>
@@ -130,7 +152,11 @@
<label>
<xsl:value-of
select="php:function('lang', 'email')"/>
</label>
- <input type="text"
name="email" id="email" value="{value_email}"></input>
+ <input type="text"
name="email" id="email" value="{value_email}">
+ <xsl:attribute
name="data-validation">
+
<xsl:text>required</xsl:text>
+ </xsl:attribute>
+ </input>
<xsl:choose>
<xsl:when
test="valid_email = 1">
<xsl:text> </xsl:text>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14805] validation,
Sigurd Nes <=