|
| From: | sigurdne |
| Subject: | [Fmsystem-commits] [17166] helpdesk: validation |
| Date: | Thu, 19 Oct 2017 03:33:28 -0400 (EDT) |
Revision: 17166
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17166
Author: sigurdne
Date: 2017-10-19 03:33:28 -0400 (Thu, 19 Oct 2017)
Log Message:
-----------
helpdesk: validation
Modified Paths:
--------------
trunk/helpdesk/inc/class.sogeneric.inc.php
trunk/property/templates/base/generic.xsl
Modified: trunk/helpdesk/inc/class.sogeneric.inc.php
===================================================================
--- trunk/helpdesk/inc/class.sogeneric.inc.php 2017-10-18 13:37:10 UTC (rev
17165)
+++ trunk/helpdesk/inc/class.sogeneric.inc.php 2017-10-19 07:33:28 UTC (rev
17166)
@@ -123,13 +123,15 @@
(
'name' =>
'name',
'descr' =>
lang('name'),
- 'type' =>
'varchar'
+ 'type' =>
'varchar',
+ 'nullable' =>
false,
),
array
(
'name' =>
'content',
'descr' =>
lang('content'),
- 'type' => 'text'
+ 'type' =>
'text',
+ 'nullable' =>
false,
),
array
(
Modified: trunk/property/templates/base/generic.xsl
===================================================================
--- trunk/property/templates/base/generic.xsl 2017-10-18 13:37:10 UTC (rev
17165)
+++ trunk/property/templates/base/generic.xsl 2017-10-19 07:33:28 UTC (rev
17166)
@@ -114,6 +114,13 @@
<xsl:choose>
<xsl:when test="type='text' or type='html'">
<textarea cols="{//textareacols}" rows="{//textarearows}" name="values[{name}]"
id="{name}" class="pure-input-1-2" >
+
<xsl:choose>
+
<xsl:when test="nullable!='1' or required=1">
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
<xsl:value-of select="value"/>
</textarea>
</xsl:when>
@@ -123,7 +130,7 @@
<xsl:value-of select="$descr"/>
</xsl:attribute>
<xsl:choose>
-
<xsl:when test="nullable!='1'">
+
<xsl:when test="nullable!='1' or required=1">
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -137,7 +144,7 @@
<xsl:value-of select="$descr"/>
</xsl:attribute>
<xsl:choose>
-
<xsl:when test="nullable!='1'">
+
<xsl:when test="nullable!='1' or required=1">
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -153,7 +160,7 @@
<xsl:value-of select="$descr"/>
</xsl:attribute>
<xsl:choose>
-
<xsl:when test="nullable!='1'">
+
<xsl:when test="nullable!='1' or required=1">
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -213,7 +220,7 @@
<xsl:when test="type='select'">
<select id="{name}" name="values[{name}]" class="pure-input-1-2" >
<xsl:choose>
-
<xsl:when test="nullable!='1'">
+
<xsl:when test="nullable!='1' or required=1">
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -235,7 +242,7 @@
<xsl:when test="type='multiple_select'">
<select id="{name}" name="values[{name}][]" multiple="multiple"
class="pure-input-1-2" >
<xsl:choose>
-
<xsl:when test="nullable!='1'">
+
<xsl:when test="nullable!='1' or required=1">
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
@@ -259,7 +266,7 @@
<xsl:text> disabled</xsl:text>
</xsl:attribute>
</xsl:when>
-
<xsl:when test="nullable!='1'">
+
<xsl:when test="nullable!='1' or required=1">
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
| [Prev in Thread] | Current Thread | [Next in Thread] |