airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject airavata-php-gateway git commit: fixing application input showing issue
Date Wed, 28 Oct 2015 17:17:29 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/master d71391019 -> 109d1d4d2


fixing application input showing issue


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

Branch: refs/heads/master
Commit: 109d1d4d2b5c3488e03d7fa026998277e9106394
Parents: d713910
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Wed Oct 28 13:17:23 2015 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Wed Oct 28 13:17:23 2015 -0400

----------------------------------------------------------------------
 app/libraries/ExperimentUtilities.php | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/109d1d4d/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 26a5e45..d3bbfb2 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -71,25 +71,18 @@ class ExperimentUtilities
         foreach ($experimentInputs as $input) {
             $matchingAppInput = null;
 
-            foreach ($applicationInputs as $applicationInput) {
-                if ($input->name == $applicationInput->name) {
-                    $matchingAppInput = $applicationInput;
-                }
-            }
-            //var_dump($matchingAppInput);
-
-            if ($matchingAppInput->type == DataType::URI && empty($input->metaData))
{
+            if ($input->type == DataType::URI && empty($input->metaData)) {
                 $explode = explode('/', $input->value);
                 echo '<p><a target="_blank"
                         href="' . URL::to("/") . "/.." . Config::get('pga_config.airavata')['experiment-data-dir']
                     . "/" . $explode[sizeof($explode) - 2] . '/' . $explode[sizeof($explode)
- 1] . '">' .
                     $explode[sizeof($explode) - 1] . '
                 <span class="glyphicon glyphicon-new-window"></span></a></p>';
-            }elseif($matchingAppInput->type == DataType::URI && !empty($input->metaData)
+            }elseif($input->type == DataType::URI && !empty($input->metaData)
                 && json_decode($input->metaData)->location=="remote"){
                 echo '<p>' . $input->name . ': ' . $input->value . '</p>';
-            }elseif ($matchingAppInput->type == DataType::STRING || $matchingAppInput->type
== DataType::INTEGER
-                || $matchingAppInput->type == DataType::FLOAT) {
+            }elseif ($input->type == DataType::STRING || $input->type == DataType::INTEGER
+                || $input->type == DataType::FLOAT) {
                 echo '<p>' . $input->name . ': ' . $input->value . '</p>';
             }
         }


Mime
View raw message