You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by nd...@apache.org on 2016/08/16 21:06:48 UTC
airavata-php-gateway git commit: Resolving AIRAVATA-2038 Adding Email
Addresses for Notifications to experiment summary
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop 1734a82c0 -> e903df6dd
Resolving AIRAVATA-2038 Adding Email Addresses for Notifications to experiment summary
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/e903df6d
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e903df6d
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e903df6d
Branch: refs/heads/develop
Commit: e903df6ddf1bcc629cc2973bedefacaace79fd5d
Parents: 1734a82
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Tue Aug 16 14:06:14 2016 -0700
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Tue Aug 16 14:06:14 2016 -0700
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 1 -
app/views/admin/manage-experiments.blade.php | 9 ++++++++-
app/views/partials/experiment-info.blade.php | 10 ++++++++++
3 files changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e903df6d/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 2885dd6..dfe5761 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -202,7 +202,6 @@ class ExperimentUtilities
*/
public static function get_experiment($expId)
{
-
try {
return Airavata::getExperiment(Session::get('authz-token'), $expId);
} catch (InvalidRequestException $ire) {
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e903df6d/app/views/admin/manage-experiments.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-experiments.blade.php b/app/views/admin/manage-experiments.blade.php
index e4f21c5..e53e432 100644
--- a/app/views/admin/manage-experiments.blade.php
+++ b/app/views/admin/manage-experiments.blade.php
@@ -23,7 +23,7 @@
<div class="col-md-6">
<input type="text" class="form-control experimentId"/>
</div>
- <button class="col-md-3 btn btn-primary get-experiment">Get</button>
+ <button class="col-md-3 btn btn-primary get-experiment" disabled="disabled">Get</button>
<div class="loading-img hide text-center"><img src="{{URL::to('/')}}/assets/ajax-loader.gif"/></div>
</div>
@@ -356,6 +356,13 @@ to be uncommented when actually in use.
e.stopPropagation();
});
+ $(".experimentId").keyup( function(){
+ if( $.trim( $(this).val()) == "")
+ $(".get-experiment").attr("disabled", "disabled");
+ else
+ $(".get-experiment").removeAttr("disabled");
+ });
+
$(".get-experiment").click(function () {
$(".loading-img").removeClass("hide");
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e903df6d/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 fa6a605..4e7bdae 100644
--- a/app/views/partials/experiment-info.blade.php
+++ b/app/views/partials/experiment-info.blade.php
@@ -98,6 +98,16 @@
</tr>
@endif
-->
+ @if( isset( $experiment->enableEmailNotification))
+ <tr>
+ <td>Notifications Enabled for:</td>
+ <td>
+ @foreach( $experiment->emailAddresses as $email)
+ {{ $email}}<br/>
+ @endforeach
+ </td>
+ </tr>
+ @endif
@if( isset($dashboard))
<tr>