Commit 77158b92 authored by Xavier Guimard's avatar Xavier Guimard

Attribute help was not displayed (#Closes: #895)

parent 27b351c6
......@@ -189,12 +189,12 @@ all: configure common handler manager portal
minify: $(JSDSTFILES) $(CSSDSTFILES)
%.min.css: %.css
echo "Compressing $*.css"; \
yui-compressor $*.css > $*.min.css
@echo "Compressing $*.css"; \
@yui-compressor $*.css > $*.min.css
%.min.js: %.js
echo "Compressing $*.js"; \
yui-compressor $*.js > $*.min.js
@echo "Compressing $*.js"; \
@yui-compressor $*.js > $*.min.js
#
......
......@@ -438,7 +438,7 @@ sub scanTree {
$attr->{type} =~
s/^(?:url|word|pcre|lmAttrOrMacro|hostname|PerlModule)$/text/;
$jleaf->{type} = $attr->{type} if ( $attr->{type} ne 'text' );
foreach my $w (qw(default select get template)) {
foreach my $w (qw(default help select get template)) {
$jleaf->{$w} = $attr->{$w} if ( defined $attr->{$w} );
}
if ( $jleaf->{default} and ref( $jleaf->{default} ) ) {
......
......@@ -1237,6 +1237,7 @@ sub attributes {
# related to a SAML SP partner
samlSPMetaDataNodes => {
type => 'samlSPMetaDataNodeContainer',
help => 'authsaml.html',
template => 'samlSPMetaDataNode',
},
......
......@@ -17,5 +17,5 @@ buttons=[{
},{
"title": "deleteEntry",
"icon": "minus-sign"
];
}];
</script>
......@@ -313,6 +313,7 @@ switch(tpl){
{
"cnodes" : tpl+"s/"+key+"/"+"samlIDPMetaDataExportedAttributes",
"default" : [],
"help" : "authsaml.html#exported_attributes",
"id" : tpl+"s/"+key+"/"+"samlIDPMetaDataExportedAttributes",
"title" : "samlIDPMetaDataExportedAttributes",
"type" : "samlAttributeContainer"
......@@ -580,6 +581,7 @@ switch(tpl){
{
"cnodes" : tpl+"s/"+key+"/"+"samlSPMetaDataExportedAttributes",
"default" : [],
"help" : "idpsaml.html#exported_attributes",
"id" : tpl+"s/"+key+"/"+"samlSPMetaDataExportedAttributes",
"title" : "samlSPMetaDataExportedAttributes",
"type" : "samlAttributeContainer"
......@@ -758,18 +760,21 @@ switch(tpl){
"type" : "rule"
}
],
"help" : "writingrulesand_headers.html#rules",
"id" : tpl+"s/"+key+"/"+"locationRules",
"title" : "locationRules",
"type" : "ruleContainer"
},
{
"cnodes" : tpl+"s/"+key+"/"+"exportedHeaders",
"help" : "writingrulesand_headers.html#headers",
"id" : tpl+"s/"+key+"/"+"exportedHeaders",
"title" : "exportedHeaders",
"type" : "keyTextContainer"
},
{
"cnodes" : tpl+"s/"+key+"/"+"post",
"help" : "formreplay.html",
"id" : tpl+"s/"+key+"/"+"post",
"title" : "post",
"type" : "postContainer"
......
......@@ -74,9 +74,7 @@
if (typeof val === 'undefined') val = !$scope.showH;
$scope.showH = val;
var d = new Date(Date.now());
console.log(d);
d.setFullYear(d.getFullYear() + 1);
console.log(d);
$cookies.put('showhelp', (val ? 'true' : 'false'), {
"expires": d
});
......@@ -624,7 +622,6 @@
}
var setHelp = function(scope) {
if (!$scope.showH) return;
while (!scope.$modelValue.help && scope.$parentNodeScope) {
scope = scope.$parentNodeScope;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment