Fix viewer display issue

environments/ppa-mbqj77/deployments/791^2
Christophe Maudoux 6 years ago
parent 418b3f75c4
commit 1f782ec4c1
  1. 6
      lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm
  2. 4
      lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm
  3. 3
      lemonldap-ng-manager/site/coffee/viewer.coffee
  4. 2
      lemonldap-ng-manager/site/htdocs/static/js/conftree.js
  5. 3
      lemonldap-ng-manager/site/htdocs/static/js/conftree.min.js
  6. 2
      lemonldap-ng-manager/site/htdocs/static/js/conftree.min.js.map
  7. 2
      lemonldap-ng-manager/site/htdocs/static/js/manager.js
  8. 2
      lemonldap-ng-manager/site/htdocs/static/js/manager.min.js
  9. 7
      lemonldap-ng-manager/site/htdocs/static/js/viewer.js
  10. 3
      lemonldap-ng-manager/site/htdocs/static/js/viewer.min.js
  11. 2
      lemonldap-ng-manager/site/htdocs/static/js/viewer.min.js.map

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

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

@ -355,6 +355,9 @@ llapp.controller 'TreeCtrl', [
node.type = 'text'
node.data = '######'
# 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$/
node.data = parseInt(node.data, 10)
# Split SAML types

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

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

File diff suppressed because one or more lines are too long

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.12.8
// Generated by CoffeeScript 1.12.7
/*
LemonLDAP::NG Viewer client
@ -446,6 +446,11 @@ This file contains:
node.type = 'text';
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$/)) {
node.data = parseInt(node.data, 10);
} 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
Loading…
Cancel
Save