diff --git a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal.pm b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal.pm index 75286a597..d96eb365c 100644 --- a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal.pm +++ b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal.pm @@ -5,7 +5,7 @@ # Alias for Lemonldap::NG::SharedConf package Lemonldap::NG::Portal; -our $VERSION = '0.88'; +our $VERSION = '0.89'; use Lemonldap::NG::Portal::SharedConf; use base 'Lemonldap::NG::Portal::SharedConf'; diff --git a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Menu.pm b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Menu.pm index 4d312007e..9fb017dc1 100755 --- a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Menu.pm +++ b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Menu.pm @@ -20,7 +20,7 @@ use Lemonldap::NG::Portal::PasswordDBLDAP; #inherits *_modifyPassword = *Lemonldap::NG::Portal::PasswordDBLDAP::modifyPassword; *_passwordDBInit = *Lemonldap::NG::Portal::PasswordDBLDAP::passwordDBInit; -our $VERSION = '0.1'; +our $VERSION = '0.11'; ### ACCESS CONTROL DISPLAY SYSTEM @@ -217,6 +217,7 @@ sub appslistDescription { # @return XML root element object sub _getXML { my $self = shift; + return $self->{_xml} if($self->{_xml}); # Parse XML file my $parser = XML::LibXML->new(); @@ -229,7 +230,7 @@ sub _getXML { # Filter XML file with user's authorizations $self->_filterXML($root); - return $root; + return $self->{_xml} = $root; } ## @method string _displayCategory() @@ -293,14 +294,15 @@ sub _displayApplication { # Get application items my $appid = $app->getAttribute('id'); - my $appname = $app->getElementsByTagName('name')->string_value() || $appid; + my $appname = $app->getChildrenByTagName('name')->string_value() || $appid; my $appuri = - $self->_userParam( $app->getElementsByTagName('uri')->string_value() - || "#" ); + $self->_userParam( $app->getChildrenByTagName('uri')->string_value() + || "" ); # Display application - $html .= -"
  • $appname\n"; + $html .= "
  • " + . ($appuri ? "$appname" : "$appname") + . "\n"; my @appnodes = $app->findnodes("application"); if (@appnodes) { $html .= "