You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/07/04 15:42:01 UTC

[1/3] airavata-php-gateway git commit: Fix for AIRAVATA-2463

Repository: airavata-php-gateway
Updated Branches:
  refs/heads/develop b6c715d67 -> 06544a153


Fix for AIRAVATA-2463


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/c1bedd40
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/c1bedd40
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/c1bedd40

Branch: refs/heads/develop
Commit: c1bedd400a935cefcffb687cb299cad14398214d
Parents: 26a207a
Author: Sneha Tilak <ti...@Snehas-MacBook-Pro.local>
Authored: Mon Jul 3 16:51:59 2017 -0500
Committer: Sneha Tilak <ti...@Snehas-MacBook-Pro.local>
Committed: Mon Jul 3 16:51:59 2017 -0500

----------------------------------------------------------------------
 app/controllers/AdminController.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/c1bedd40/app/controllers/AdminController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index 1227901..b9adfed 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -494,6 +494,7 @@ class AdminController extends BaseController {
         if ($validator->fails()) {
             Session::put("validationMessages", [$validator->messages()] );
             return Redirect::to("admin/dashboard")
+                ->withInput()
                 ->withErrors($validator);
         }
         else{
@@ -505,11 +506,14 @@ class AdminController extends BaseController {
                 $user_profile = Keycloak::getUserProfile($username);
                 EmailUtilities::gatewayRequestMail($user_profile["firstname"], $user_profile["lastname"], $email, $inputs["gateway-name"]);
                 Session::put("message", "Your request for Gateway " . $inputs["gateway-name"] . " has been created.");
+                return Redirect::to("admin/dashboard");
             }
             else{
-                Session::put("errorMessages", "Error: A Gateway already exists with the same GatewayId, Name or URL! Please make a new request.");
+                $error = "A Gateway already exists with the same GatewayId, Name or URL! Please make a new request.";
+                return Redirect::to("admin/dashboard")
+                    ->withInput()
+                    ->withErrors($error);
             }
-            return Redirect::to("admin/dashboard");
         }
     }
 


[3/3] airavata-php-gateway git commit: Merge remote-tracking branch 'sneha/2463' into develop

Posted by ma...@apache.org.
Merge remote-tracking branch 'sneha/2463' into develop

This closes #62


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/06544a15
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/06544a15
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/06544a15

Branch: refs/heads/develop
Commit: 06544a1535b994e3a7d602fd66b230a846649fe0
Parents: b6c715d a5cb98a
Author: Marcus Christie <ma...@iu.edu>
Authored: Tue Jul 4 11:41:43 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Tue Jul 4 11:41:43 2017 -0400

----------------------------------------------------------------------
 app/controllers/AdminController.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------



[2/3] airavata-php-gateway git commit: Fix for AIRAVATA-2463

Posted by ma...@apache.org.
Fix for AIRAVATA-2463


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/a5cb98a2
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/a5cb98a2
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/a5cb98a2

Branch: refs/heads/develop
Commit: a5cb98a20647669fbb3b5bd71f37310fff172574
Parents: c1bedd4
Author: Sneha Tilak <ti...@Snehas-MacBook-Pro.local>
Authored: Mon Jul 3 16:53:58 2017 -0500
Committer: Sneha Tilak <ti...@Snehas-MacBook-Pro.local>
Committed: Mon Jul 3 16:53:58 2017 -0500

----------------------------------------------------------------------
 app/controllers/AdminController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a5cb98a2/app/controllers/AdminController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index b9adfed..07e0dd2 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -506,7 +506,6 @@ class AdminController extends BaseController {
                 $user_profile = Keycloak::getUserProfile($username);
                 EmailUtilities::gatewayRequestMail($user_profile["firstname"], $user_profile["lastname"], $email, $inputs["gateway-name"]);
                 Session::put("message", "Your request for Gateway " . $inputs["gateway-name"] . " has been created.");
-                return Redirect::to("admin/dashboard");
             }
             else{
                 $error = "A Gateway already exists with the same GatewayId, Name or URL! Please make a new request.";
@@ -514,6 +513,7 @@ class AdminController extends BaseController {
                     ->withInput()
                     ->withErrors($error);
             }
+            return Redirect::to("admin/dashboard");
         }
     }