admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HSLE#44387 Uitvraagscripts: .toggle gebruiken, ##SHOW## conditievelden niet readonly

Browse Source 
svn path=/Website/trunk/; revision=38692
This commit is contained in:
Alex Tiehuis
2018-08-01 14:06:49 +00:00
parent 99193535b3
commit 2fe3379cdc
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
APPL/Shared/kenmerk_common.inc
View File

@@ -495,7 +495,9 @@ function listKenmerk(sql, module, key, props)
var flexkenmerkwaarde = null;
val_seperator = ':';
var def_val = oRs("kenmerk_default").Value;
var isExpression = false, expressionClass = "";
var isExpression = false;
var expressionClass = "";
var isReadonly = false;
addPreview = false;
if (!kenmerk_search && !multiMode)
@@ -506,14 +508,12 @@ function listKenmerk(sql, module, key, props)
if (def_val && (def_val.match('##EXPR##') != null || def_val.match('##SHOW##') != null))
{
if (def_val.match('##SHOW##'))
expressionClass = " flexshow ";
switch(true) {
case def_val.match('##EXPR##'):
case def_val.match('##EXPR##') != null:
expressionClass = " flexexpr ";
isReadonly = true;
break;
case def_val.match('##SHOW##'):
case def_val.match('##SHOW##') != null:
expressionClass = " flexshow ";
break;
}
@@ -782,7 +782,7 @@ function listKenmerk(sql, module, key, props)
+ (isExpression? " expression " + expressionClass : "")
+ "'"
+ (required ? " required='required' " : "")
+ (isExpression ? " readonly " : "")
+ (isReadonly ? " readonly " : "")
+ " rows=3 "
+ " maxlength='"+klen+"'"
+ " name='" + nameprefix + idCounter + "val' id='" + nameprefix + idCounter + "val' "
@@ -821,7 +821,7 @@ function listKenmerk(sql, module, key, props)
+ (isExpression? " expression " + expressionClass : "")
+ "'"
+ (required ? " required='required' " : "")
+ (isExpression ? " readonly " : "")
+ (isReadonly ? " readonly " : "")
//+ " placeholder='"+flexkenmerklabel+"'"
+ " value='" + safe.htmlattr(flexkenmerkwaarde) + "'"
+ " maxlength='" + klen + "'"
@@ -1408,7 +1408,7 @@ function listKenmerk(sql, module, key, props)
+ (isExpression? " expression " + expressionClass : "")
+ "'"
+ (required ? " required='required' " : "")
+ (isExpression? " readonly " : "")
+ (isReadonly ? " readonly " : "")
+ " size=\"5\""
+ " value='" + safe.htmlattr(flexkenmerkwaarde) + "'"
+ ">";
@@ -1503,7 +1503,7 @@ function listKenmerk(sql, module, key, props)
+ (isExpression? " expression " + expressionClass : "")
+ "'"
+ (required ? " required='required' " : "")
+ (isExpression ? " readonly " : "")
+ (isReadonly ? " readonly " : "")
+ " value='" + (kdec > 0 && flexkenmerkwaarde? safe.displayfloat(parseFloat(flexkenmerkwaarde), kdec) : safe.html(flexkenmerkwaarde)) + "'"
+ " maxlength='" + ((kmin >= 0? 0 : 1) + (kdec > 0? 1 : 0) + klen) + "'"
+ ">";
@@ -1523,7 +1523,7 @@ function listKenmerk(sql, module, key, props)
+ (isExpression? " expression " + expressionClass : "")
+ "'"
+ (required ? " required='required' " : "")
+ (isExpression? " readonly " : "")
+ (isReadonly ? " readonly " : "")
+ " value='" + safe.htmlattr(flexkenmerkwaarde) + "'"
+ ">";