airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [16/23] airavata-php-gateway git commit: Fixed AIRAVATA-1952. User cannot launch an experiment if application is not deployed on a resource
Date Sat, 23 Apr 2016 02:08:13 GMT
Fixed AIRAVATA-1952. User cannot launch an experiment if application is not deployed on a resource


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

Branch: refs/heads/master
Commit: 06f822094e337e21c8cf6a3d419e3af5490137d9
Parents: f36dca0
Author: Nipurn Doshi <nipunhere@gmail.com>
Authored: Fri Apr 15 16:24:19 2016 -0400
Committer: Nipurn Doshi <nipunhere@gmail.com>
Committed: Fri Apr 15 16:24:19 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/06f82209/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index fd28303..038e176 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -74,7 +74,6 @@ class ExperimentUtilities
         }
         array_multisort($order, SORT_ASC, $experimentInputs);
         if( count( $experimentInputs) > 0 ) { 
-            echo '<h3>Saved Inputs</strong></h3>';
             foreach ($experimentInputs as $input) {
                 $matchingAppInput = null;
 

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/06f82209/app/views/experiment/edit.blade.php
----------------------------------------------------------------------
diff --git a/app/views/experiment/edit.blade.php b/app/views/experiment/edit.blade.php
index e73e5e7..7fbb968 100755
--- a/app/views/experiment/edit.blade.php
+++ b/app/views/experiment/edit.blade.php
@@ -24,7 +24,7 @@
 
             @include('partials/experiment-inputs', array( "expInputs", $expInputs))
 
-
+            @if( count( $expInputs['computeResources']) > 0)
             <div class="btn-toolbar">
                 <div class="btn-group">
                     <input name="save" type="submit" class="btn btn-primary"
@@ -33,6 +33,10 @@
                            value="Save and launch" <?php if (!$expInputs['expVal']['editable'])
echo 'disabled' ?>>
                 </div>
             </div>
+            @else
+            <p class="well alert alert-danger">
+                This experiment is connected with an Application which is currently not deployed
on any Resource. The experiment cannot be launched at the moment.
+            </p>
 
 
         </form>

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/06f82209/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 52446b6..6163afe 100644
--- a/app/views/partials/experiment-inputs.blade.php
+++ b/app/views/partials/experiment-inputs.blade.php
@@ -34,6 +34,7 @@
             <h3>Enter Experiment Inputs</h3>
             @if( $expInputs["clonedExp"] || $expInputs["savedExp"])
             <div class="form-group">
+                <h3>Current Inputs</h3>
                 {{ ExperimentUtilities::list_input_files($expInputs['experiment']->experimentInputs)
}}
                 <hr/>
             </div>


Mime
View raw message