You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2016/03/30 19:48:03 UTC
[1/2] airavata-php-gateway git commit: fixing AIRAVATA-1940
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop 6b4091167 -> f7900df42
fixing AIRAVATA-1940
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/f46c5c3d
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f46c5c3d
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f46c5c3d
Branch: refs/heads/develop
Commit: f46c5c3df1079e3c5350fc16fe65c389fbd8e0a8
Parents: 8ee2f50
Author: scnakandala <su...@gmail.com>
Authored: Wed Mar 30 13:47:34 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Mar 30 13:47:34 2016 -0400
----------------------------------------------------------------------
app/controllers/ExperimentController.php | 1 +
app/libraries/ExperimentUtilities.php | 3 +--
app/views/partials/experiment-inputs.blade.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f46c5c3d/app/controllers/ExperimentController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ExperimentController.php b/app/controllers/ExperimentController.php
index eca7421..dca8d53 100755
--- a/app/controllers/ExperimentController.php
+++ b/app/controllers/ExperimentController.php
@@ -202,6 +202,7 @@ class ExperimentController extends BaseController
"experimentDescription" => $experiment->description,
"application" => $experiment->executionId,
"autoSchedule" => $experiment->userConfigurationData->airavataAutoSchedule,
+ "userDN" => $experiment->userConfigurationData->userDN,
"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/f46c5c3d/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 6e10637..1469e37 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -77,7 +77,6 @@ class ExperimentUtilities
$matchingAppInput = null;
if ($input->type == DataType::URI) {
- $hostName = $_SERVER['SERVER_NAME'];
$dataProductModel = Airavata::getDataProduct(Session::get('authz-token'), $input->value);
$currentInputPath = "";
foreach ($dataProductModel->replicaLocations as $rp) {
@@ -90,7 +89,7 @@ class ExperimentUtilities
if(!ExperimentUtilities::endsWith($dataRoot, "/"))
$dataRoot = $dataRoot . "/";
$filePath = str_replace($dataRoot, "", parse_url($currentInputPath, PHP_URL_PATH));
- echo '<p><a target="_blank" href="' . URL::to("/") . '/download/?path=' . $filePath . '">' . basename($filePath) . ' <span class="glyphicon glyphicon-new-window"></span></a></p>';
+ echo '<p>' . $input->name . ' <a target="_blank" href="' . URL::to("/") . '/download/?path=' . $filePath . '">' . basename($filePath) . ' <span class="glyphicon glyphicon-new-window"></span></a></p>';
} elseif ($input->type == DataType::STRING || $input->type == DataType::INTEGER
|| $input->type == DataType::FLOAT) {
echo '<p>' . $input->name . ': ' . $input->value . '</p>';
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f46c5c3d/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 1494bc3..95615f2 100644
--- a/app/views/partials/experiment-inputs.blade.php
+++ b/app/views/partials/experiment-inputs.blade.php
@@ -128,7 +128,7 @@
<h4>Enter UserDN</h4>
<div class="userdninfo">
- <input type="text" class="form-control" name="userDN" placeholder="user"/>
+ <input type="text" class="form-control" name="userDN" placeholder="user" value="{{$expInputs['userDN']}}"/>
</div>
</div>
</div>
[2/2] airavata-php-gateway git commit: Merge remote-tracking branch
'origin/develop' into develop
Posted by sc...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
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/f7900df4
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f7900df4
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f7900df4
Branch: refs/heads/develop
Commit: f7900df4272d4acb62beda7ee2382c2a90f7c276
Parents: f46c5c3 6b40911
Author: scnakandala <su...@gmail.com>
Authored: Wed Mar 30 13:47:44 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Mar 30 13:47:44 2016 -0400
----------------------------------------------------------------------
app/libraries/CRUtilities.php | 1 -
app/libraries/ExperimentUtilities.php | 1 -
app/views/admin/manage-experiments.blade.php | 7 +++++++
app/views/experiment/browse.blade.php | 6 ++++++
app/views/partials/compute-resource-preferences.blade.php | 10 ++--------
5 files changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f7900df4/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------