airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shame...@apache.org
Subject airavata-php-gateway git commit: Fixed for experiment clone and launch
Date Tue, 21 Jul 2015 02:06:51 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/master 2dcc3998e -> 14665d086


Fixed for experiment clone and launch


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

Branch: refs/heads/master
Commit: 14665d08653a61c43c3a177c8033c2d291daae2c
Parents: 2dcc399
Author: Shameera Rathnayaka <shameerainfo@gmail.com>
Authored: Mon Jul 20 22:06:42 2015 -0400
Committer: Shameera Rathnayaka <shameerainfo@gmail.com>
Committed: Mon Jul 20 22:06:42 2015 -0400

----------------------------------------------------------------------
 app/controllers/ExperimentController.php       | 6 +++---
 app/libraries/ExperimentUtilities.php          | 4 ++--
 app/views/partials/experiment-inputs.blade.php | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/14665d08/app/controllers/ExperimentController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ExperimentController.php b/app/controllers/ExperimentController.php
index d6313de..d1391aa 100755
--- a/app/controllers/ExperimentController.php
+++ b/app/controllers/ExperimentController.php
@@ -173,13 +173,13 @@ class ExperimentController extends BaseController
         $expVal = ExperimentUtilities::get_experiment_values($experiment, $project);
         $expVal["jobState"] = ExperimentUtilities::get_job_status($experiment);
 
-        $computeResources = CRUtilities::create_compute_resources_select($experiment->applicationId,
$expVal['scheduling']->resourceHostId);
+        $computeResources = CRUtilities::create_compute_resources_select($experiment->executionId,
$expVal['scheduling']->resourceHostId);
 
         $experimentInputs = array(
             "disabled" => ' ',
-            "experimentName" => $experiment->name,
+            "experimentName" => $experiment->experimentName,
             "experimentDescription" => $experiment->description,
-            "application" => $experiment->applicationId,
+            "application" => $experiment->executionId,
             "allowedFileSize" => Config::get('pga_config.airavata')["server-allowed-file-size"],
             'experiment' => $experiment,
             "queueDefaults" => $queueDefaults,

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/14665d08/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index e17ecf4..aeda63e 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -401,7 +401,7 @@ class ExperimentUtilities
             //create new experiment to receive the clone
             $experiment = Airavata::getExperiment($expId);
 
-            $cloneId = Airavata::cloneExperiment($expId, 'Clone of ' . $experiment->name);
+            $cloneId = Airavata::cloneExperiment($expId, 'Clone of ' . $experiment->experimentName);
 
             CommonUtilities::print_success_message("<p>Experiment cloned!</p>"
.
                 '<p>You will be redirected to the edit page shortly, or you can
@@ -906,7 +906,7 @@ class ExperimentUtilities
         $experiment->description = rtrim($input['experiment-description']);
         $experiment->projectId = $input['project'];
         //$experiment->applicationId = $_POST['application'];
-        $experiment->executionId = $_POST['application'];
+//        $experiment->executionId = $_POST['application'];
 
         $userConfigDataUpdated = $experiment->userConfigurationData;
         $schedulingUpdated = $userConfigDataUpdated->computationalResourceScheduling;

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/14665d08/app/views/partials/experiment-inputs.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/experiment-inputs.blade.php b/app/views/partials/experiment-inputs.blade.php
index 9d054ed..f7c0522 100644
--- a/app/views/partials/experiment-inputs.blade.php
+++ b/app/views/partials/experiment-inputs.blade.php
@@ -15,7 +15,7 @@
 <div class="form-group required">
     <label for="project" class="control-label">Project</label>
     @if( isset( $expInputs['cloning']))
-    {{ ProjectUtilities::create_project_select($expInputs['experiment']->projectID, $expInputs['expVal']['editable'])
}}
+    {{ ProjectUtilities::create_project_select($expInputs['experiment']->projectId, $expInputs['expVal']['editable'])
}}
     @else
     {{ ProjectUtilities::create_project_select($expInputs['project'], !$expInputs['disabled'])
}}
     @endif


Mime
View raw message