From 2f19ccb1695806ea4e04ec651107e7cd72dd7223 Mon Sep 17 00:00:00 2001
From: Xavier Guimard <xavier.guimard@laposte.net>
Date: Mon, 11 Apr 2016 05:12:39 +0000
Subject: [PATCH] prepare display() for later Ajax usage (#595)

---
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm | 2 +-
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm     | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm
index d0486726a..c22c9559b 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm
@@ -319,7 +319,7 @@ sub display {
     }
 
     $self->lmLog( "Skin returned: $skinfile", 'debug' );
-    return $self->sendHtml( $req, "$skinfile", params => \%templateParams );
+    return ( $skinfile, \%templateParams);
 
 }
 
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm
index b16354dc2..2e9fff8dd 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm
@@ -113,7 +113,8 @@ sub do {
     }
     else {
         if ($err) {
-            return $self->display($req);
+            my ( $tpl, $prms ) = $self->display($req);
+            return $self->sendHtml( $req, $tpl, params => $prms );
         }
         else {
             return $self->autoRedirect($req);
@@ -163,7 +164,8 @@ sub autoRedirect {
         ];
     }
     else {
-        return $self->display($req);
+        my ( $tpl, $prms ) = $self->display($req);
+        return $self->sendHtml( $req, $tpl, params => $prms );
     }
 }