airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject airavata-php-gateway git commit: wip
Date Wed, 28 Jun 2017 18:32:34 GMT
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 <supun.nakandala@gmail.com>
Authored: Wed Jun 28 14:32:32 2017 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
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);
         }
     }
 


Mime
View raw message