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/06/06 10:08:47 UTC
[1/2] airavata-php-gateway git commit: Fixing experiment not shown in
Admin DashBoard
Repository: airavata-php-gateway
Updated Branches:
refs/heads/airavata-php-gateway-0.15-release 0996733e4 -> ee45c04d9
Fixing experiment not shown in Admin DashBoard
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/2f2c2ed5
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/2f2c2ed5
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/2f2c2ed5
Branch: refs/heads/airavata-php-gateway-0.15-release
Commit: 2f2c2ed5cccd6689141536c8b193ac65dcffaffc
Parents: b2ca8f7
Author: Supun Nakandala <sc...@apache.org>
Authored: Sat Jun 6 13:35:03 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Sat Jun 6 13:35:03 2015 +0530
----------------------------------------------------------------------
app/controllers/ExperimentController.php | 6 +-
app/libraries/AppUtilities.php | 2 +-
app/libraries/ExperimentUtilities.php | 12 +--
app/views/account/create.blade.php | 4 +-
app/views/account/login.blade.php | 2 +-
app/views/admin/manage-experiments.blade.php | 112 ++++++++++------------
app/views/resource/browse.blade.php | 3 +-
7 files changed, 68 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2f2c2ed5/app/controllers/ExperimentController.php
----------------------------------------------------------------------
diff --git a/app/controllers/ExperimentController.php b/app/controllers/ExperimentController.php
index 9639716..65616f5 100755
--- a/app/controllers/ExperimentController.php
+++ b/app/controllers/ExperimentController.php
@@ -66,7 +66,7 @@ class ExperimentController extends BaseController
/* Not required.
else
{
- Utilities::print_success_message("<p>Experiment {$_POST['experiment-name']} created!</p>" .
+ CommonUtilities::print_success_message("<p>Experiment {$_POST['experiment-name']} created!</p>" .
'<p>You will be redirected to the summary page shortly, or you can
<a href=' . URL::to('/') . '"/experiment/summary?expId=' . $expId . '">go directly</a> to experiment summary page.</p>');
@@ -135,9 +135,9 @@ class ExperimentController extends BaseController
$expVal = ExperimentUtilities::get_experiment_values($experiment, $project);
/*if (isset($_POST['save']))
{
- $updatedExperiment = Utilities::apply_changes_to_experiment($experiment);
+ $updatedExperiment = CommonUtilities::apply_changes_to_experiment($experiment);
- Utilities::update_experiment($experiment->experimentID, $updatedExperiment);
+ CommonUtilities::update_experiment($experiment->experimentID, $updatedExperiment);
}*/
if (isset($_POST['launch'])) {
ExperimentUtilities::launch_experiment($experiment->experimentID);
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2f2c2ed5/app/libraries/AppUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/AppUtilities.php b/app/libraries/AppUtilities.php
index 5ceb44a..2b02cea 100644
--- a/app/libraries/AppUtilities.php
+++ b/app/libraries/AppUtilities.php
@@ -224,7 +224,7 @@ class AppUtilities
CommonUtilities::print_warning_message('<p>You must create an application module, interface and deployment space before you can create an experiment.
Click <a href="' . URL::to('/') . '/app/module">here</a> to create an application.</p>');
/*
- Utilities::print_error_message('<p>There was a problem getting all applications.
+ CommonUtilities::print_error_message('<p>There was a problem getting all applications.
Please try again later or submit a bug report using the link in the Help menu.</p>' .
'<p>Airavata System Exception: ' . $ase->getMessage() . '</p>');
*/
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2f2c2ed5/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index ad41762..8dd2ade 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -556,7 +556,7 @@ class ExperimentUtilities
if ($expId) {
/*
- Utilities::print_success_message("Experiment {$_POST['experiment-name']} created!" .
+ CommonUtilities::print_success_message("Experiment {$_POST['experiment-name']} created!" .
' <a href="experiment_summary.php?expId=' . $expId . '">Go to experiment summary page</a>');
*/
} else {
@@ -723,21 +723,21 @@ class ExperimentUtilities
case '':
}
} catch (InvalidRequestException $ire) {
- Utilities::print_error_message('InvalidRequestException!<br><br>' . $ire->getMessage());
+ CommonUtilities::print_error_message('InvalidRequestException!<br><br>' . $ire->getMessage());
} catch (AiravataClientException $ace) {
- Utilities::print_error_message('AiravataClientException!<br><br>' . $ace->getMessage());
+ CommonUtilities::print_error_message('AiravataClientException!<br><br>' . $ace->getMessage());
} catch (AiravataSystemException $ase) {
if ($ase->airavataErrorType == 2) // 2 = INTERNAL_ERROR
{
- Utilities::print_info_message('<p>You have not created any experiments yet, so no results will be returned!</p>
+ CommonUtilities::print_info_message('<p>You have not created any experiments yet, so no results will be returned!</p>
<p>Click <a href="create_experiment.php">here</a> to create an experiment, or
<a href="create_project.php">here</a> to create a new project.</p>');
} else {
- Utilities::print_error_message('There was a problem with Airavata. Please try again later or report a bug using the link in the Help menu.');
+ CommonUtilities::print_error_message('There was a problem with Airavata. Please try again later or report a bug using the link in the Help menu.');
//print_error_message('AiravataSystemException!<br><br>' . $ase->airavataErrorType . ': ' . $ase->getMessage());
}
} catch (TTransportException $tte) {
- Utilities::print_error_message('TTransportException!<br><br>' . $tte->getMessage());
+ CommonUtilities::print_error_message('TTransportException!<br><br>' . $tte->getMessage());
}
//get values of all experiments
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2f2c2ed5/app/views/account/create.blade.php
----------------------------------------------------------------------
diff --git a/app/views/account/create.blade.php b/app/views/account/create.blade.php
index 7d92a7f..0709d2e 100755
--- a/app/views/account/create.blade.php
+++ b/app/views/account/create.blade.php
@@ -17,7 +17,7 @@
@if ($errors->has())
@foreach ($errors->all() as $error)
- {{ Utilities::print_error_message($error) }}
+ {{ CommonUtilities::print_error_message($error) }}
@endforeach
@endif
@@ -25,7 +25,7 @@
<form action="create" method="post" role="form">
@if( Session::has('username_exists'))
- {{ Utilities::print_error_message('The username you entered is already in use. Please select another.') }}
+ {{ CommonUtilities::print_error_message('The username you entered is already in use. Please select another.') }}
@endif
<?php
Session::forget("username_exists");
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2f2c2ed5/app/views/account/login.blade.php
----------------------------------------------------------------------
diff --git a/app/views/account/login.blade.php b/app/views/account/login.blade.php
index 2d6d58e..7ef30cc 100755
--- a/app/views/account/login.blade.php
+++ b/app/views/account/login.blade.php
@@ -18,7 +18,7 @@
<form action="login" method="post" role="form">
@if( Session::has("invalid-credentials") )
- {{ Utilities::print_error_message('Invalid username or password. Please try again.') }}
+ {{ CommonUtilities::print_error_message('Invalid username or password. Please try again.') }}
@endif
<?php
Session::forget("invalid-credentials");
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2f2c2ed5/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 eb97fba..6781e95 100644
--- a/app/views/admin/manage-experiments.blade.php
+++ b/app/views/admin/manage-experiments.blade.php
@@ -394,17 +394,13 @@ to be uncommented when actually in use.
-->
<!-- Flot Charts JavaScript -->
-<!--[if lte IE 8]>
-<script src="js/excanvas.min.js')}}<![endif]-->
{{ HTML::script('js/flot/jquery.flot.js')}}
{{ HTML::script('js/flot/jquery.flot.tooltip.min.js')}}
{{ HTML::script('js/flot/jquery.flot.resize.js')}}
{{ HTML::script('js/flot/jquery.flot.pie.js')}}
{{ HTML::script('js/flot/flot-data.js')}}
-<script>
- //make first tab of accordion open by default.
- //temporary fix
+<script>
$("#accordion2").children(".panel").children(".collapse").addClass("in");
$(".add-tenant").slideUp();
@@ -412,67 +408,65 @@ to be uncommented when actually in use.
$(".add-tenant").slideDown();
});
- $(function () {
- $('.tree li:has(ul)').addClass('parent_li').find(' > span').attr('title', 'Collapse this branch');
- $('.tree li.parent_li > span').on('click', function (e) {
- var children = $(this).parent('li.parent_li').find(' > ul > li');
- if (children.is(":visible")) {
- children.hide('fast');
- $(this).attr('title', 'Expand this branch').find(' > i').addClass('icon-plus-sign').removeClass('icon-minus-sign');
- } else {
- children.show('fast');
- $(this).attr('title', 'Collapse this branch').find(' > i').addClass('icon-minus-sign').removeClass('icon-plus-sign');
- }
- e.stopPropagation();
- });
-
- $(".get-experiment").click(function () {
- $(".loading-img").removeClass("hide");
- $.ajax({
- url: 'experiment/summary?expId=' + $(".experimentId").val(),
- type: 'get',
- success: function (data) {
- $(".experiment-info").html(data);
-
- }
- }).complete(function () {
- $(".loading-img").addClass("hide");
- });
- });
- //Experiment stages are under development.
- $(".tree").parent().addClass("hide");
+ $('.tree li:has(ul)').addClass('parent_li').find(' > span').attr('title', 'Collapse this branch');
+ $('.tree li.parent_li > span').on('click', function (e) {
+ var children = $(this).parent('li.parent_li').find(' > ul > li');
+ if (children.is(":visible")) {
+ children.hide('fast');
+ $(this).attr('title', 'Expand this branch').find(' > i').addClass('icon-plus-sign').removeClass('icon-minus-sign');
+ } else {
+ children.show('fast');
+ $(this).attr('title', 'Collapse this branch').find(' > i').addClass('icon-minus-sign').removeClass('icon-plus-sign');
+ }
+ e.stopPropagation();
+ });
- /* making datetimepicker work for exp search */
+ $('.get-experiment').on('click', function (e) {
+ $('.loading-img').removeClass('hide');
+ $.ajax({
+ url: 'experiment/summary?expId=' + $(".experimentId").val(),
+ type: 'get',
+ success: function (data) {
+ $(".experiment-info").html(data);
- $('#datetimepicker9').datetimepicker({
- pick12HourFormat: false
- });
- $('#datetimepicker10').datetimepicker({
- pick12HourFormat: false
- });
- $("#datetimepicker9").on("dp.change", function (e) {
- $('#datetimepicker10').data("DateTimePicker").setMinDate(e.date);
- });
- $("#datetimepicker10").on("dp.change", function (e) {
- $('#datetimepicker9').data("DateTimePicker").setMaxDate(e.date);
+ }
+ }).complete(function () {
+ $(".loading-img").addClass("hide");
});
+ });
- /* selecting creation time */
- $("#search-key").on("change", function () {
- if (this.value == "creation-time") {
- $(".search-text-block").addClass("hide");
- $(".select-dates").removeClass("hide");
- $("#search-value").removeAttr("required");
+ //Experiment stages are under development.
+ $(".tree").parent().addClass("hide");
- }
- else {
- $(".search-text-block").removeClass("hide");
- $(".select-dates").addClass("hide");
- $("#search-value").attr("required");
- }
- });
+ /* making datetimepicker work for exp search */
+
+ $('#datetimepicker9').datetimepicker({
+ pick12HourFormat: false
+ });
+ $('#datetimepicker10').datetimepicker({
+ pick12HourFormat: false
+ });
+ $("#datetimepicker9").on("dp.change", function (e) {
+ $('#datetimepicker10').data("DateTimePicker").setMinDate(e.date);
+ });
+ $("#datetimepicker10").on("dp.change", function (e) {
+ $('#datetimepicker9').data("DateTimePicker").setMaxDate(e.date);
+ });
+ /* selecting creation time */
+ $("#search-key").on("change", function () {
+ if (this.value == "creation-time") {
+ $(".search-text-block").addClass("hide");
+ $(".select-dates").removeClass("hide");
+ $("#search-value").removeAttr("required");
+
+ }
+ else {
+ $(".search-text-block").removeClass("hide");
+ $(".select-dates").addClass("hide");
+ $("#search-value").attr("required");
+ }
});
</script>
@stop
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2f2c2ed5/app/views/resource/browse.blade.php
----------------------------------------------------------------------
diff --git a/app/views/resource/browse.blade.php b/app/views/resource/browse.blade.php
index ac78bfa..d50e359 100644
--- a/app/views/resource/browse.blade.php
+++ b/app/views/resource/browse.blade.php
@@ -16,7 +16,8 @@
@if ( isset( $allCRs) )
@if (sizeof($allCRs) == 0)
- {{ Utilities::print_warning_message('No Compute Resources are registered. Please use "Register Compute Resource" to
+ {{ CommonUtilities::print_warning_message('No Compute Resources are registered. Please use "Register Compute
+ Resource" to
register a new resources.') }}
@else
<div class="col-md-12">
[2/2] airavata-php-gateway git commit: Merge branch
'airavata-php-gateway-0.15-release' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into
airavata-php-gateway-0.15-release
Posted by sc...@apache.org.
Merge branch 'airavata-php-gateway-0.15-release' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into airavata-php-gateway-0.15-release
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/ee45c04d
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/ee45c04d
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/ee45c04d
Branch: refs/heads/airavata-php-gateway-0.15-release
Commit: ee45c04d94e2cc3daec69dfeaf2651c353df2d64
Parents: 2f2c2ed 0996733
Author: Supun Nakandala <sc...@apache.org>
Authored: Sat Jun 6 13:37:24 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Sat Jun 6 13:37:24 2015 +0530
----------------------------------------------------------------------
app/config/pga_config.php | 130 --------------------------------
app/config/pga_config.php.template | 130 ++++++++++++++++++++++++++++++++
2 files changed, 130 insertions(+), 130 deletions(-)
----------------------------------------------------------------------