You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2016/03/21 17:09:26 UTC
[2/4] airavata-php-gateway git commit: New user dashboard error fix
New user dashboard error fix
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/bbcbff27
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/bbcbff27
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/bbcbff27
Branch: refs/heads/master
Commit: bbcbff27a630d4d1640bac3d3493ec21d8cd4880
Parents: eab4943
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Sun Mar 20 19:42:06 2016 -0400
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Sun Mar 20 19:42:06 2016 -0400
----------------------------------------------------------------------
app/controllers/AccountController.php | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bbcbff27/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index f302663..0ae5d00 100644
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -151,11 +151,12 @@ class AccountController extends BaseController
CommonUtilities::store_id_in_session($username);
Session::put("gateway_id", Config::get('pga_config.airavata')['gateway-id']);
- if(Session::get("admin") || Session::get("admin-read-only") || Session::get("authorized-user")){
+ if(Session::has("admin") || Session::has("admin-read-only") || Session::has("authorized-user")){
return $this->initializeWithAiravata($username);
}
- if(Session::get("admin") || Session::get("admin-read-only")){
+ if(Session::has("admin") || Session::has("admin-read-only")){
+
return Redirect::to("admin/dashboard");
}else{
return Redirect::to("account/dashboard");
@@ -237,7 +238,11 @@ class AccountController extends BaseController
return View::make('home');
}
- return Redirect::to("admin/dashboard");
+ if(Session::has("admin") || Session::has("admin-read-only")){
+ return Redirect::to("admin/dashboard");
+ }else{
+ return Redirect::to("account/dashboard");
+ }
}
public function forgotPassword()