Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 56837200CAD for ; Wed, 28 Jun 2017 20:32:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 553EC160BF7; Wed, 28 Jun 2017 18:32:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 99AE7160BD9 for ; Wed, 28 Jun 2017 20:32:35 +0200 (CEST) Received: (qmail 11772 invoked by uid 500); 28 Jun 2017 18:32:34 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 11763 invoked by uid 99); 28 Jun 2017 18:32:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Jun 2017 18:32:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B22D9DFB94; Wed, 28 Jun 2017 18:32:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: scnakandala@apache.org To: commits@airavata.apache.org Message-Id: <308b53badee64ae28dffaad3b9353a39@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: airavata-php-gateway git commit: wip Date: Wed, 28 Jun 2017 18:32:34 +0000 (UTC) archived-at: Wed, 28 Jun 2017 18:32:36 -0000 Repository: airavata-php-gateway Updated Branches: refs/heads/develop cdd6f009b -> ba061350a wip Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/ba061350 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/ba061350 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/ba061350 Branch: refs/heads/develop Commit: ba061350a11c355d4b69e66188988266fe30720a Parents: cdd6f00 Author: scnakandala Authored: Wed Jun 28 14:32:32 2017 -0400 Committer: scnakandala Committed: Wed Jun 28 14:32:32 2017 -0400 ---------------------------------------------------------------------- app/controllers/AccountController.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ba061350/app/controllers/AccountController.php ---------------------------------------------------------------------- diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php index 499e751..1fe3724 100644 --- a/app/controllers/AccountController.php +++ b/app/controllers/AccountController.php @@ -174,9 +174,9 @@ class AccountController extends BaseController } if(Session::has("admin") || Session::has("admin-read-only")){ - return Redirect::to("admin/dashboard". "?status=ok&code=".$accessToken); + return Redirect::to("admin/dashboard". "?status=ok&code=".$accessToken . "&username=".$username); }else{ - return Redirect::to("account/dashboard". "?status=ok&code=".$accessToken); + return Redirect::to("account/dashboard". "?status=ok&code=".$accessToken . "&username=".$username); } } @@ -245,9 +245,9 @@ class AccountController extends BaseController } if(Session::has("admin") || Session::has("admin-read-only")){ - return Redirect::to("admin/dashboard" . "?status=ok&code=".$accessToken); + return Redirect::to("admin/dashboard" . "?status=ok&code=" . $accessToken . "&username=".$username); }else{ - return Redirect::to("account/dashboard" . "?status=ok&code=".$accessToken); + return Redirect::to("account/dashboard" . "?status=ok&code=".$accessToken . "&username=".$username); } } @@ -291,9 +291,9 @@ class AccountController extends BaseController Session::put('user-profile', $userProfile); if(Session::has("admin") || Session::has("admin-read-only")){ - return Redirect::to("admin/dashboard". "?status=ok&code=".$accessToken); + return Redirect::to("admin/dashboard". "?status=ok&code=".$accessToken . "&username=".$username); }else{ - return Redirect::to("account/dashboard". "?status=ok&code=".$accessToken); + return Redirect::to("account/dashboard". "?status=ok&code=".$accessToken ."&username=".$username); } }