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 AIRAVATA-1806
Date Tue, 20 Oct 2015 01:09:35 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/master 8ca399994 -> b27453cc2


fixing AIRAVATA-1806


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

Branch: refs/heads/master
Commit: b27453cc245062aa407abf525d3fe354565f780b
Parents: 8ca3999
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Mon Oct 19 21:09:28 2015 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Mon Oct 19 21:09:28 2015 -0400

----------------------------------------------------------------------
 app/views/experiment/create-complete.blade.php  | 17 ++++++++++++++++
 app/views/partials/experiment-inputs.blade.php  |  4 +++-
 .../partials/experiment-queue-block.blade.php   | 21 ++++++++++++++++----
 3 files changed, 37 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b27453cc/app/views/experiment/create-complete.blade.php
----------------------------------------------------------------------
diff --git a/app/views/experiment/create-complete.blade.php b/app/views/experiment/create-complete.blade.php
index 6b1bf00..b095fe7 100644
--- a/app/views/experiment/create-complete.blade.php
+++ b/app/views/experiment/create-complete.blade.php
@@ -95,5 +95,22 @@
         }
         warn = true;
     }
+
+    //Selecting the first option as the default
+    $( document ).ready(function() {
+        var crId = $("#compute-resource").val();
+        $(".loading-img ").removeClass("hide");
+        $.ajax({
+            url: '../experiment/getQueueView',
+            type: 'get',
+            data: {crId: crId},
+            success: function (data) {
+                $(".queue-view").html(data);
+                $(".loading-img ").addClass("hide");
+            },error : function(data){
+                $(".loading-img ").addClass("hide");
+            }
+        });
+    });
 </script>
 @stop
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b27453cc/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 98f20f5..fc0af55 100644
--- a/app/views/partials/experiment-inputs.blade.php
+++ b/app/views/partials/experiment-inputs.blade.php
@@ -51,7 +51,9 @@
             <label class="control-label" for="compute-resource">Compute Resource</label>
             @if( count( $expInputs['computeResources']) > 0)
             <select class="form-control" name="compute-resource" id="compute-resource"
required="required">
-                <option value="">Select a resource</option>
+                @if(count($expInputs['computeResources']) > 1)
+                    <option value="">Select a resource</option>
+                @endif
                 @foreach ($expInputs['computeResources'] as $id => $name)
                 <option value="{{$id}}"
                 {{ ($expInputs['resourceHostId'] == $id)? ' selected' : '' }}>{{$name}}</option>

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b27453cc/app/views/partials/experiment-queue-block.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/experiment-queue-block.blade.php b/app/views/partials/experiment-queue-block.blade.php
index 391a2dc..1b2fb42 100644
--- a/app/views/partials/experiment-queue-block.blade.php
+++ b/app/views/partials/experiment-queue-block.blade.php
@@ -68,13 +68,11 @@
     </div>
 </div>
 
-@section('scripts')
-@parent
-<script>
 
+<script>
+    //To work work with experiment create (Ajax)
     var selectedQueue = $("#select-queue").val();
     getQueueData(selectedQueue);
-
     $("#select-queue").change(function () {
         var selectedQueue = $(this).val();
         getQueueData(selectedQueue);
@@ -126,4 +124,19 @@
         $(".queue-data").removeClass("hide");
     }
 </script>
+
+
+@section('scripts')
+@parent
+<script>
+    //To work with experiment edit (Not Ajax)
+    $( document ).ready(function() {
+        var selectedQueue = $("#select-queue").val();
+        getQueueData(selectedQueue);
+        $("#select-queue").change(function () {
+            var selectedQueue = $(this).val();
+            getQueueData(selectedQueue);
+        });
+    });
+</script>
 @stop
\ No newline at end of file


Mime
View raw message