airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndo...@apache.org
Subject airavata-php-gateway git commit: Experiment Bug Fixes
Date Wed, 13 May 2015 16:00:55 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/master 9f1063344 -> 1c887b3e0


Experiment Bug Fixes


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

Branch: refs/heads/master
Commit: 1c887b3e015dd0f2a6d2343df0aa9e1eb93964d8
Parents: 9f10633
Author: Nipurn Doshi <nipunhere@gmail.com>
Authored: Wed May 13 12:00:39 2015 -0400
Committer: Nipurn Doshi <nipunhere@gmail.com>
Committed: Wed May 13 12:00:39 2015 -0400

----------------------------------------------------------------------
 app/controllers/ExperimentController.php     |  1 +
 app/libraries/Utilities.php                  | 22 +---------------------
 app/views/layout/basic.blade.php             |  1 -
 app/views/partials/dashboard-block.blade.php |  2 +-
 4 files changed, 3 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/1c887b3e/app/controllers/ExperimentController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ExperimentController.php b/app/controllers/ExperimentController.php
index 6421727..28c1f3a 100755
--- a/app/controllers/ExperimentController.php
+++ b/app/controllers/ExperimentController.php
@@ -57,6 +57,7 @@ class ExperimentController extends BaseController {
 						        "resourceHostId" => null,
 						        "advancedOptions" => $app_config["advanced-experiment-options"]
 					        );
+
 			return View::make( "experiment/create-complete", array( "expInputs" => $experimentInputs)
);
 		}
 

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/1c887b3e/app/libraries/Utilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/Utilities.php b/app/libraries/Utilities.php
index e3b91be..611e54b 100644
--- a/app/libraries/Utilities.php
+++ b/app/libraries/Utilities.php
@@ -1199,27 +1199,7 @@ public static function create_application_select($id = null, $editable
= true)
  */
 public static function create_compute_resources_select($applicationId, $resourceHostId)
 {
-    $computeResources = Utilities::get_available_app_interface_compute_resources($applicationId);
-    
-    if( count( $computeResources) > 0)
-    {
-    	echo '<select class="form-control" name="compute-resource" id="compute-resource">';
-	    foreach ($computeResources as $id => $name)
-	    {
-	        $selected = ($resourceHostId == $id)? ' selected' : '';
-
-	        echo '<option value="' . $id . '"' . $selected . '>' .
-	                $name . '</option>';
-
-	    }
-
-    	echo '</select>';
-    }
-    else
-    {
-    	echo "<h4>No Compute Resources exist at the moment.";
-    }
-
+    return Utilities::get_available_app_interface_compute_resources($applicationId);
 }
 
 

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/1c887b3e/app/views/layout/basic.blade.php
----------------------------------------------------------------------
diff --git a/app/views/layout/basic.blade.php b/app/views/layout/basic.blade.php
index 05dd58b..947593e 100755
--- a/app/views/layout/basic.blade.php
+++ b/app/views/layout/basic.blade.php
@@ -34,7 +34,6 @@
         Utilities::print_error_message("You need to be an admin to use this service.");
         Session::forget("admin-alert");
     }
-    
 ?>
 
 @show

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/1c887b3e/app/views/partials/dashboard-block.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/dashboard-block.blade.php b/app/views/partials/dashboard-block.blade.php
index ae4bf34..7f61710 100644
--- a/app/views/partials/dashboard-block.blade.php
+++ b/app/views/partials/dashboard-block.blade.php
@@ -1,7 +1,7 @@
 <div class="collapse navbar-collapse navbar-ex1-collapse">
                 <ul class="nav navbar-nav side-nav">
                     <li @if( Session::has("manage"))  class="active" @endif>
-                        <a href="{{ URL::to('/')}}/admin/dashboard/gateway"><i class="fa
fa-fw fa-dashboard"></i> Gateway@if( Session::has("scigap_admin"))s@endif</a>
+                        <a href="{{ URL::to('/')}}/admin/dashboard/gateway"><i class="fa
fa-fw fa-dashboard"></i>@if( Session::has("scigap_admin"))Gateways @else Gateway
@endif</a>
                     </li>
                     <li>
                         <a href="{{ URL::to('/')}}/admin/dashboard/users"><i class="fa
fa-fw fa-bar-chart-o"></i> Users</a>


Mime
View raw message