Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 69DDD18298 for ; Tue, 15 Dec 2015 16:12:35 +0000 (UTC) Received: (qmail 72412 invoked by uid 500); 15 Dec 2015 16:12:32 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 72380 invoked by uid 500); 15 Dec 2015 16:12:31 -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 72365 invoked by uid 99); 15 Dec 2015 16:12:31 -0000 Received: from Unknown (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Dec 2015 16:12:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 48C35DFB8A; Tue, 15 Dec 2015 16:12:00 +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: <07c61b8d4f704d8f8e1a57446241d04d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: airavata-php-gateway git commit: fixing invalid admin warning Date: Tue, 15 Dec 2015 16:12:00 +0000 (UTC) Repository: airavata-php-gateway Updated Branches: refs/heads/master 5308fe891 -> cd0cba97e fixing invalid admin warning 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/cd0cba97 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/cd0cba97 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/cd0cba97 Branch: refs/heads/master Commit: cd0cba97e5dd1324912c8abeda17ef28e8648c41 Parents: 5308fe8 Author: scnakandala Authored: Tue Dec 15 11:11:56 2015 -0500 Committer: scnakandala Committed: Tue Dec 15 11:11:56 2015 -0500 ---------------------------------------------------------------------- app/controllers/AccountController.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/cd0cba97/app/controllers/AccountController.php ---------------------------------------------------------------------- diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php index bb469dd..3f1bd6b 100755 --- a/app/controllers/AccountController.php +++ b/app/controllers/AccountController.php @@ -154,7 +154,12 @@ class AccountController extends BaseController if(Session::get("admin") || Session::get("admin-read-only") || Session::get("authorized-user")){ return $this->initializeWithAiravata($username); } - return Redirect::to("admin/dashboard"); + + if(Session::get("admin") || Session::get("admin-read-only")){ + return Redirect::to("admin/dashboard"); + }else{ + return Redirect::to("home"); + } } }