airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [3/4] airavata-php-gateway git commit: Experiment save works with Airavata master
Date Mon, 20 Jul 2015 20:40:27 GMT
Experiment save works with Airavata master


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

Branch: refs/heads/master
Commit: 1c9edccc1b09c4e3845701ff31885259503dbd9c
Parents: 6e8c5fc
Author: Shameera Rathnayaka <shameerainfo@gmail.com>
Authored: Mon Jul 20 16:26:48 2015 -0400
Committer: Shameera Rathnayaka <shameerainfo@gmail.com>
Committed: Mon Jul 20 16:26:48 2015 -0400

----------------------------------------------------------------------
 app/controllers/ExperimentController.php | 2 +-
 app/libraries/ExperimentUtilities.php    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/1c9edccc/app/controllers/ExperimentController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ExperimentController.php b/app/controllers/ExperimentController.php
index 142dfdd..d6313de 100755
--- a/app/controllers/ExperimentController.php
+++ b/app/controllers/ExperimentController.php
@@ -82,7 +82,7 @@ class ExperimentController extends BaseController
             $expVal = ExperimentUtilities::get_experiment_values($experiment, $project);
             $expVal["jobState"] = ExperimentUtilities::get_job_status($experiment);
             $jobDetails = ExperimentUtilities::get_job_details($experiment->experimentId);
-            $transferDetails = ExperimentUtilities::get_transfer_details($experiment->experimentId);
+//            $transferDetails = ExperimentUtilities::get_transfer_details($experiment->experimentId);
             //var_dump( $jobDetails); exit;
             // User should not clone or edit a failed experiment. Only create clones of it.
             if ($expVal["experimentStatusString"] == "FAILED")

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/1c9edccc/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 43696cc..e17ecf4 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -57,7 +57,7 @@ class ExperimentUtilities
      */
     public static function list_input_files($experiment)
     {
-        $applicationInputs = AppUtilities::get_application_inputs($experiment->applicationId);
+        $applicationInputs = AppUtilities::get_application_inputs($experiment->executionId);
 
         $experimentInputs = $experiment->experimentInputs;
 
@@ -906,6 +906,7 @@ class ExperimentUtilities
         $experiment->description = rtrim($input['experiment-description']);
         $experiment->projectId = $input['project'];
         //$experiment->applicationId = $_POST['application'];
+        $experiment->executionId = $_POST['application'];
 
         $userConfigDataUpdated = $experiment->userConfigurationData;
         $schedulingUpdated = $userConfigDataUpdated->computationalResourceScheduling;


Mime
View raw message