Fix viewer display issue

This commit is contained in:
Christophe Maudoux 2019-08-13 21:59:30 +02:00
parent 418b3f75c4
commit 1f782ec4c1
11 changed files with 25 additions and 11 deletions

View File

@ -3636,10 +3636,12 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
'type' => 'text' 'type' => 'text'
}, },
'vhostAliases' => { 'vhostAliases' => {
'type' => 'text' 'default' => '',
'type' => 'text'
}, },
'vhostAuthnLevel' => { 'vhostAuthnLevel' => {
'type' => 'int' 'default' => '',
'type' => 'int'
}, },
'vhostHttps' => { 'vhostHttps' => {
'default' => -1, 'default' => -1,

View File

@ -1884,7 +1884,7 @@ sub attributes {
type => 'int', type => 'int',
default => -1, default => -1,
}, },
vhostAliases => { type => 'text', }, vhostAliases => { type => 'text', default => '' },
vhostType => { vhostType => {
type => 'select', type => 'select',
select => [ select => [
@ -1901,7 +1901,7 @@ sub attributes {
default => 'Main', default => 'Main',
documentation => 'Handler type', documentation => 'Handler type',
}, },
vhostAuthnLevel => { type => 'int', }, vhostAuthnLevel => { type => 'int', default => '' },
# SecureToken parameters # SecureToken parameters
secureTokenAllowOnError => { secureTokenAllowOnError => {

View File

@ -355,6 +355,9 @@ llapp.controller 'TreeCtrl', [
node.type = 'text' node.type = 'text'
node.data = '######' node.data = '######'
# Cast int as int (remember that booleans are int for Perl) # Cast int as int (remember that booleans are int for Perl)
if node.type and node.type.match /^(bool|trool|boolOrExpr)$/
if typeof node.data == 'string' and node.data.match /^(?:-1|0|1)$/
node.data = parseInt(node.data, 10)
if node.type and node.type.match /^int$/ if node.type and node.type.match /^int$/
node.data = parseInt(node.data, 10) node.data = parseInt(node.data, 10)
# Split SAML types # Split SAML types

View File

@ -1149,6 +1149,7 @@ function templates(tpl,key) {
"type" : "bool" "type" : "bool"
}, },
{ {
"default" : "",
"get" : tpl+"s/"+key+"/"+"vhostAliases", "get" : tpl+"s/"+key+"/"+"vhostAliases",
"id" : tpl+"s/"+key+"/"+"vhostAliases", "id" : tpl+"s/"+key+"/"+"vhostAliases",
"title" : "vhostAliases" "title" : "vhostAliases"
@ -1199,6 +1200,7 @@ function templates(tpl,key) {
"type" : "select" "type" : "select"
}, },
{ {
"default" : "",
"get" : tpl+"s/"+key+"/"+"vhostAuthnLevel", "get" : tpl+"s/"+key+"/"+"vhostAuthnLevel",
"id" : tpl+"s/"+key+"/"+"vhostAuthnLevel", "id" : tpl+"s/"+key+"/"+"vhostAuthnLevel",
"title" : "vhostAuthnLevel", "title" : "vhostAuthnLevel",

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.12.8 // Generated by CoffeeScript 1.12.7
/* /*
LemonLDAP::NG Manager client LemonLDAP::NG Manager client

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.12.8 // Generated by CoffeeScript 1.12.7
/* /*
LemonLDAP::NG Viewer client LemonLDAP::NG Viewer client
@ -446,6 +446,11 @@ This file contains:
node.type = 'text'; node.type = 'text';
node.data = '######'; node.data = '######';
} }
if (node.type && node.type.match(/^(bool|trool|boolOrExpr)$/)) {
if (typeof node.data === 'string' && node.data.match(/^(?:-1|0|1)$/)) {
node.data = parseInt(node.data, 10);
}
}
if (node.type && node.type.match(/^int$/)) { if (node.type && node.type.match(/^int$/)) {
node.data = parseInt(node.data, 10); node.data = parseInt(node.data, 10);
} else if (node.type && node.type.match(/^(saml(Service|Assertion)|blackWhiteList)$/) && !(typeof node.data === 'object')) { } else if (node.type && node.type.match(/^(saml(Service|Assertion)|blackWhiteList)$/) && !(typeof node.data === 'object')) {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long