fixing merge conflict
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/397b70a0 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/397b70a0 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/397b70a0 Branch: refs/heads/airavata-php-gateway-0.15-release Commit: 397b70a0db26ff65b4ca62a8ab6f567a82a43489 Parents: 7ad8f45 ee45c04 Author: Supun Nakandala <[email protected]> Authored: Sat Jun 6 14:09:38 2015 +0530 Committer: Supun Nakandala <[email protected]> Committed: Sat Jun 6 14:09:38 2015 +0530 ---------------------------------------------------------------------- app/libraries/AppUtilities.php | 5 -- app/libraries/ExperimentUtilities.php | 20 +++-- app/views/admin/manage-experiments.blade.php | 13 ++- app/views/experiment/search.blade.php | 96 +++++++++++------------ 4 files changed, 66 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/397b70a0/app/libraries/AppUtilities.php ---------------------------------------------------------------------- diff --cc app/libraries/AppUtilities.php index a789fcf,2b02cea..96e3f30 --- a/app/libraries/AppUtilities.php +++ b/app/libraries/AppUtilities.php @@@ -223,11 -223,11 +223,6 @@@ class AppUtilitie } catch (AiravataSystemException $ase) { 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>'); -- /* - CommonUtilities::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>'); -- */ } if (count($applications) == 0) http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/397b70a0/app/libraries/ExperimentUtilities.php ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/397b70a0/app/views/admin/manage-experiments.blade.php ---------------------------------------------------------------------- diff --cc app/views/admin/manage-experiments.blade.php index c6aae9b,6781e95..05be87d --- a/app/views/admin/manage-experiments.blade.php +++ b/app/views/admin/manage-experiments.blade.php @@@ -410,6 -408,7 +408,10 @@@ to be uncommented when actually in use $(".add-tenant").slideDown(); }); ++<<<<<<< HEAD ++======= + ++>>>>>>> ee45c04d94e2cc3daec69dfeaf2651c353df2d64 $('.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'); @@@ -423,8 -422,8 +425,13 @@@ e.stopPropagation(); }); ++<<<<<<< HEAD + $(".get-experiment").click(function () { + $(".loading-img").removeClass("hide"); ++======= + $('.get-experiment').on('click', function (e) { + $('.loading-img').removeClass('hide'); ++>>>>>>> ee45c04d94e2cc3daec69dfeaf2651c353df2d64 $.ajax({ url: 'experiment/summary?expId=' + $(".experimentId").val(), type: 'get',
