Simplifying error msg on entering wrong experiment Id
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/6b20ef96 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/6b20ef96 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/6b20ef96 Branch: refs/heads/master Commit: 6b20ef969c186892a49409d1adee59a9e44b82d2 Parents: d7b2ab0 Author: Nipurn Doshi <[email protected]> Authored: Wed Jan 27 15:25:39 2016 -0500 Committer: Nipurn Doshi <[email protected]> Committed: Wed Jan 27 15:25:39 2016 -0500 ---------------------------------------------------------------------- app/libraries/ExperimentUtilities.php | 24 ++++++----------------- app/views/partials/experiment-info.blade.php | 2 ++ 2 files changed, 8 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6b20ef96/app/libraries/ExperimentUtilities.php ---------------------------------------------------------------------- diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php index 354ab42..94dac15 100644 --- a/app/libraries/ExperimentUtilities.php +++ b/app/libraries/ExperimentUtilities.php @@ -101,29 +101,17 @@ class ExperimentUtilities try { return Airavata::getExperiment(Session::get('authz-token'), $expId); } catch (InvalidRequestException $ire) { - CommonUtilities::print_error_message('<p>There was a problem getting the experiment. - Please try again later or submit a bug report using the link in the Help menu.</p>' . - '<p>InvalidRequestException: ' . $ire->getMessage() . '</p>'); + CommonUtilities::print_error_message('<p>InvalidRequestException: ' . $ire->getMessage() . '</p>'); } catch (ExperimentNotFoundException $enf) { - CommonUtilities::print_error_message('<p>There was a problem getting the experiment. - Please try again later or submit a bug report using the link in the Help menu.</p>' . - '<p>ExperimentNotFoundException: ' . $enf->getMessage() . '</p>'); + CommonUtilities::print_error_message('<p>ExperimentNotFoundException: ' . $enf->getMessage() . '</p>'); } catch (AiravataClientException $ace) { - CommonUtilities::print_error_message('<p>There was a problem getting the experiment. - Please try again later or submit a bug report using the link in the Help menu.</p>' . - '<p>AiravataClientException: ' . $ace->getMessage() . '</p>'); + CommonUtilities::print_error_message('AiravataClientException: ' . $ace->getMessage() . '</p>'); } catch (AiravataSystemException $ase) { - CommonUtilities::print_error_message('<p>There was a problem getting the experiment. - Please try again later or submit a bug report using the link in the Help menu.</p>' . - '<p>AiravataSystemException: ' . $ase->getMessage() . '</p>'); + CommonUtilities::print_error_message('AiravataSystemException: ' . $ase->getMessage() . '</p>'); } catch (TTransportException $tte) { - CommonUtilities::print_error_message('<p>There was a problem getting the experiment. - Please try again later or submit a bug report using the link in the Help menu.</p>' . - '<p>TTransportException: ' . $tte->getMessage() . '</p>'); + CommonUtilities::print_error_message('TTransportException: ' . $tte->getMessage() . '</p>'); } catch (Exception $e) { - CommonUtilities::print_error_message('<p>There was a problem getting the experiment. - Please try again later or submit a bug report using the link in the Help menu.</p>' . - '<p>Exception: ' . $e->getMessage() . '</p>'); + CommonUtilities::print_error_message('Exception: ' . $e->getMessage() . '</p>'); } } http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6b20ef96/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 79b09db..1d53c17 100644 --- a/app/views/partials/experiment-info.blade.php +++ b/app/views/partials/experiment-info.blade.php @@ -1,9 +1,11 @@ <div class="container" style="max-width: 750px;"> @if(isset( $invalidExperimentId ) ) + <!-- <div class="alert alert-danger"> The Experiment ID does not exist. Please go to correct experiment. </div> + --> @else <h1> Experiment Summary
