airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [38/50] [abbrv] airavata-php-gateway git commit: experiment clone fixes
Date Wed, 27 Jul 2016 17:05:46 GMT
experiment clone fixes


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

Branch: refs/heads/develop
Commit: 2eb9f65cfea3e30164c3bcef1977bdf79a388277
Parents: 06c1704
Author: Jeff Kinnison <jeffdkinnison@gmail.com>
Authored: Fri Jul 15 12:19:53 2016 -0400
Committer: Jeff Kinnison <jeffdkinnison@gmail.com>
Committed: Fri Jul 15 12:19:53 2016 -0400

----------------------------------------------------------------------
 app/controllers/ExperimentController.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2eb9f65c/app/controllers/ExperimentController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ExperimentController.php b/app/controllers/ExperimentController.php
index 28be5e5..799426d 100755
--- a/app/controllers/ExperimentController.php
+++ b/app/controllers/ExperimentController.php
@@ -90,6 +90,7 @@ class ExperimentController extends BaseController
                     <a href=' . URL::to('/') . '"/experiment/summary?expId=' . $expId
. '">go directly</a> to experiment summary page.</p>');
 
             }*/
+            $users = SharingUtilities::getAllUserProfiles($expId, ResourceType::EXPERIMENT);
             return Redirect::to('experiment/summary?expId=' . $expId);
         } else
             return Redirect::to("home")->with("message", "Something went wrong here. Please
file a bug report using the link in the Help menu.");
@@ -109,9 +110,9 @@ class ExperimentController extends BaseController
                 Session::put("permissionDenied", true);
                 CommonUtilities::print_error_message('It seems that you do not have permissions
to view this experiment or it belongs to another gateway.');
                 if (Input::has("dashboard"))
-                    return View::make("partials/experiment-info", array("invalidExperimentId"
=> 1));
+                    return View::make("partials/experiment-info", array("invalidExperimentId"
=> 1, "users" => json_encode(array())));
                 else
-                    return View::make("experiment/summary", array("invalidExperimentId" =>
1));
+                    return View::make("experiment/summary", array("invalidExperimentId" =>
1), "users" => json_encode(array()));
             }
             else
                 Session::forget("permissionDenied");
@@ -161,9 +162,9 @@ class ExperimentController extends BaseController
             }
         } else {
             if (Input::has("dashboard"))
-                return View::make("partials/experiment-info", array("invalidExperimentId"
=> 1));
+                return View::make("partials/experiment-info", array("invalidExperimentId"
=> 1, "users" => json_encode(array())));
             else
-                return View::make("experiment/summary", array("invalidExperimentId" =>
1));
+                return View::make("experiment/summary", array("invalidExperimentId" =>
1, "users" => json_encode(array())));
         }
     }
 


Mime
View raw message