Fix manager conf display

This commit is contained in:
Christophe Maudoux 2018-07-23 00:13:43 +02:00
parent 593f128f99
commit cb077e8829
5 changed files with 19 additions and 8 deletions

View File

@ -700,7 +700,8 @@ sub attributes {
'type' => 'text'
},
'casSrvMetaDataOptionsGateway' => {
'type' => 'bool'
'default' => 0,
'type' => 'bool'
},
'casSrvMetaDataOptionsIcon' => {
'type' => 'text'
@ -711,7 +712,8 @@ sub attributes {
'type' => 'keyTextContainer'
},
'casSrvMetaDataOptionsRenew' => {
'type' => 'bool'
'default' => 0,
'type' => 'bool'
},
'casSrvMetaDataOptionsUrl' => {
'msgFail' => '__badUrl__',
@ -1852,7 +1854,8 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
'type' => 'select'
},
'oidcRPMetaDataOptionsLogoutSessionRequired' => {
'type' => 'bool'
'default' => 0,
'type' => 'bool'
},
'oidcRPMetaDataOptionsLogoutType' => {
'default' => 'front',

View File

@ -2510,13 +2510,13 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
type => 'subContainer',
documentation => 'Root of CAS server options',
},
casSrvMetaDataOptionsGateway => { type => 'bool', },
casSrvMetaDataOptionsGateway => { type => 'bool', default => 0 },
casSrvMetaDataOptionsProxiedServices => {
type => 'keyTextContainer',
keyTest => qr/^\w/,
keyMsgFail => '__badCasProxyId__',
},
casSrvMetaDataOptionsRenew => { type => 'bool', },
casSrvMetaDataOptionsRenew => { type => 'bool', default => 0 },
casSrvMetaDataOptionsUrl => {
type => 'text',
test => $url,
@ -3145,6 +3145,7 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
},
oidcRPMetaDataOptionsLogoutSessionRequired => {
type => 'bool',
default => 0,
documentation => 'Session required for logout',
},
};

View File

@ -218,6 +218,7 @@ sub cTrees {
casSrvMetaDataNode => [
{
title => 'casSrvMetaDataOptions',
form => 'simpleInputContainer',
nodes => [
'casSrvMetaDataOptionsUrl',
'casSrvMetaDataOptionsRenew',
@ -232,6 +233,7 @@ sub cTrees {
casAppMetaDataNode => [
{
title => 'casAppMetaDataOptions',
form => 'simpleInputContainer',
nodes => [
'casAppMetaDataOptionsService',
'casAppMetaDataOptionsRule'

View File

@ -24,7 +24,8 @@ function templates(tpl,key) {
}
],
"id" : "casAppMetaDataOptions",
"title" : "casAppMetaDataOptions"
"title" : "casAppMetaDataOptions",
"type" : "simpleInputContainer"
},
{
"cnodes" : tpl+"s/"+key+"/"+"casAppMetaDataExportedVars",
@ -64,12 +65,14 @@ function templates(tpl,key) {
"title" : "casSrvMetaDataOptionsUrl"
},
{
"default" : 0,
"get" : tpl+"s/"+key+"/"+"casSrvMetaDataOptionsRenew",
"id" : tpl+"s/"+key+"/"+"casSrvMetaDataOptionsRenew",
"title" : "casSrvMetaDataOptionsRenew",
"type" : "bool"
},
{
"default" : 0,
"get" : tpl+"s/"+key+"/"+"casSrvMetaDataOptionsGateway",
"id" : tpl+"s/"+key+"/"+"casSrvMetaDataOptionsGateway",
"title" : "casSrvMetaDataOptionsGateway",
@ -87,7 +90,8 @@ function templates(tpl,key) {
}
],
"id" : "casSrvMetaDataOptions",
"title" : "casSrvMetaDataOptions"
"title" : "casSrvMetaDataOptions",
"type" : "simpleInputContainer"
},
{
"cnodes" : tpl+"s/"+key+"/"+"casSrvMetaDataExportedVars",
@ -497,6 +501,7 @@ function templates(tpl,key) {
"type" : "select"
},
{
"default" : 0,
"get" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsLogoutSessionRequired",
"id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsLogoutSessionRequired",
"title" : "oidcRPMetaDataOptionsLogoutSessionRequired",

File diff suppressed because one or more lines are too long