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 2015/07/14 18:38:42 UTC
[1/2] airavata-php-gateway git commit: fixing AIRAVATA-1766
Repository: airavata-php-gateway
Updated Branches:
refs/heads/master a50baf6f4 -> 54ec98065
fixing AIRAVATA-1766
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/d31ecace
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/d31ecace
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/d31ecace
Branch: refs/heads/master
Commit: d31ecace7bd636c7587c6fffcf00487a346379ac
Parents: a50baf6
Author: Supun Nakandala <sc...@apache.org>
Authored: Tue Jul 14 20:39:21 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Tue Jul 14 20:39:21 2015 +0530
----------------------------------------------------------------------
app/views/partials/experiment-info.blade.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/d31ecace/app/views/partials/experiment-info.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/experiment-info.blade.php b/app/views/partials/experiment-info.blade.php
index e388230..761a505 100644
--- a/app/views/partials/experiment-info.blade.php
+++ b/app/views/partials/experiment-info.blade.php
@@ -129,11 +129,11 @@
type="submit"
class="btn btn-success"
value="Launch"
- title="Launch the experiment" <?php if (!$expVal["editable"]) echo 'disabled' ?>>
+ title="Launch the experiment" <?php if (!$expVal["editable"]) echo 'style="display: none"' ?>>
<a href="{{URL::to('/') }}/experiment/cancel?expId={{ $experiment->experimentID }}"
class="btn btn-default"
role="button"
- title="Edit the experiment's settings" <?php if (!$expVal["cancelable"]) echo 'disabled' ?>>
+ tit le="Edit the experiment's settings" <?php if (!$expVal["cancelable"]) echo 'style="display: none"' ?>>
<input name="cancel" type="submit" class="btn btn-warning"
value="Cancel" <?php if (!$expVal["cancelable"]) echo 'disabled'; ?> >
</a>
@@ -147,7 +147,7 @@
<a href="{{URL::to('/') }}/experiment/edit?expId={{ $experiment->experimentID }}"
class="btn btn-default"
role="button"
- title="Edit the experiment's settings" <?php if (!$expVal["editable"]) echo 'disabled' ?>>
+ title="Edit the experiment's settings" <?php if (!$expVal["editable"]) echo 'style="display: none"' ?>>
<span class="glyphicon glyphicon-pencil"></span>
Edit
</a>
[2/2] airavata-php-gateway git commit: fixing parallelism not set
issue
Posted by sc...@apache.org.
fixing parallelism not set 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/54ec9806
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/54ec9806
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/54ec9806
Branch: refs/heads/master
Commit: 54ec98065182026de229630b6a00a87f9af5752f
Parents: d31ecac
Author: Supun Nakandala <sc...@apache.org>
Authored: Tue Jul 14 22:08:18 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Tue Jul 14 22:08:18 2015 +0530
----------------------------------------------------------------------
app/controllers/ApplicationController.php | 15 ++++++++++++++-
app/views/partials/deployment-block.blade.php | 2 +-
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/54ec9806/app/controllers/ApplicationController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ApplicationController.php b/app/controllers/ApplicationController.php
index 78b51ff..82a1317 100644
--- a/app/controllers/ApplicationController.php
+++ b/app/controllers/ApplicationController.php
@@ -114,7 +114,20 @@ class ApplicationController extends BaseController {
{
$update = true;
$appDeploymentValues = Input::all();
-
+ switch($appDeploymentValues["parallelism"]){
+ case "MPI":
+ $appDeploymentValues["parallelism"] = \Airavata\Model\AppCatalog\AppDeployment\ApplicationParallelismType::MPI;
+ break;
+ case "SERIAL":
+ $appDeploymentValues["parallelism"] = \Airavata\Model\AppCatalog\AppDeployment\ApplicationParallelismType::SERIAL;
+ break;
+ case "OPENMP":
+ $appDeploymentValues["parallelism"] = \Airavata\Model\AppCatalog\AppDeployment\ApplicationParallelismType::OPENMP;
+ break;
+ case "OPENMP_MPI":
+ $appDeploymentValues["parallelism"] = \Airavata\Model\AppCatalog\AppDeployment\ApplicationParallelismType::OPENMP_MPI;
+ break;
+ }
AppUtilities::create_or_update_appDeployment( $appDeploymentValues, $update);
$message = "Application Deployment has been updated!";
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/54ec9806/app/views/partials/deployment-block.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/deployment-block.blade.php b/app/views/partials/deployment-block.blade.php
index 58722a1..2792a36 100644
--- a/app/views/partials/deployment-block.blade.php
+++ b/app/views/partials/deployment-block.blade.php
@@ -36,7 +36,7 @@
<label class="control-label">Application Parallelism Type</label>
<select name="parallelism" class="form-control" readonly>
@foreach( $applicationParallelismTypes as $index=>$parallelismType)
- <option value="{{$index}}"
+ <option value="{{$parallelismType}}"
@if( isset( $deploymentObject) ) @if( $index == $deploymentObject->parallelism) selected @endif @endif>{{
$parallelismType }}</option>
@endforeach