You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by nd...@apache.org on 2016/03/21 00:43:51 UTC
[1/3] airavata-php-gateway git commit: New user dashboard error fix
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop eab49434b -> e674a1e88
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/develop
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()
[3/3] airavata-php-gateway git commit: Showing proper Portal Title on
Dashboard.
Posted by nd...@apache.org.
Showing proper Portal Title on Dashboard.
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/e674a1e8
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e674a1e8
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e674a1e8
Branch: refs/heads/develop
Commit: e674a1e8858bc15f2955dd4d41ada0b4b3792892
Parents: 967f8c2
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Sun Mar 20 19:43:12 2016 -0400
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Sun Mar 20 19:43:12 2016 -0400
----------------------------------------------------------------------
app/views/account/dashboard.blade.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e674a1e8/app/views/account/dashboard.blade.php
----------------------------------------------------------------------
diff --git a/app/views/account/dashboard.blade.php b/app/views/account/dashboard.blade.php
index 71faba8..e140b45 100644
--- a/app/views/account/dashboard.blade.php
+++ b/app/views/account/dashboard.blade.php
@@ -212,7 +212,7 @@
<h1>Hi! You look new here.</h1>
</div>
<div class="row well">
- <h4>Your SEAGrid account is pending approval. You will be notified via email upon approval by SEAGrid Admin.</h4>
+ <h4>Your {{ Config::get('pga_config.portal')['portal-title'] }} account is pending approval. You will be notified via email upon approval by {{ Config::get('pga_config.portal')['portal-title'] }} Admin.</h4>
</div>
</div>
@endif
[2/3] airavata-php-gateway git commit: Bringing back admin-alert
Posted by nd...@apache.org.
Bringing back admin-alert
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/967f8c28
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/967f8c28
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/967f8c28
Branch: refs/heads/develop
Commit: 967f8c287bfe2f3eb4355b3b2ca97a19c62c97de
Parents: bbcbff2
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Sun Mar 20 19:42:27 2016 -0400
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Sun Mar 20 19:42:27 2016 -0400
----------------------------------------------------------------------
app/filters.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/967f8c28/app/filters.php
----------------------------------------------------------------------
diff --git a/app/filters.php b/app/filters.php
index fd6db98..638be33 100755
--- a/app/filters.php
+++ b/app/filters.php
@@ -121,7 +121,7 @@ Route::filter('verifyauthorizeduser', function () {
Route::filter('verifyadmin', function () {
if (CommonUtilities::verify_login()) {
if (!Session::has("admin") && !Session::has("admin-read-only")) {
- return Redirect::to("home");
+ return Redirect::to("home")->with("admin-alert", true);
}
} else
return Redirect::to("home")->with("login-alert", true);
@@ -130,7 +130,7 @@ Route::filter('verifyadmin', function () {
Route::filter('verifyeditadmin', function () {
if (CommonUtilities::verify_login()) {
if (!Session::has("admin")) {
- return Redirect::to("home");
+ return Redirect::to("home")->with("admin-alert", true);
}
} else
return Redirect::to("home")->with("login-alert", true);