Repository: airavata-php-gateway Updated Branches: refs/heads/develop efde17967 -> 7fe660409
AIRAVATA-2196 Fix canceling experiment Also changed <input> buttons to <button> buttons 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/50e91170 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/50e91170 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/50e91170 Branch: refs/heads/develop Commit: 50e91170dfac4a44bd35c3ede5f4591de1dbf8b8 Parents: 5f6e8e4 Author: Marcus Christie <[email protected]> Authored: Wed Nov 9 10:18:15 2016 -0500 Committer: Marcus Christie <[email protected]> Committed: Wed Nov 9 10:18:15 2016 -0500 ---------------------------------------------------------------------- app/controllers/ExperimentController.php | 7 ------- app/routes.php | 2 -- app/views/partials/experiment-info.blade.php | 20 ++++++++++---------- 3 files changed, 10 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/50e91170/app/controllers/ExperimentController.php ---------------------------------------------------------------------- diff --git a/app/controllers/ExperimentController.php b/app/controllers/ExperimentController.php index a27d02f..c36d3ed 100755 --- a/app/controllers/ExperimentController.php +++ b/app/controllers/ExperimentController.php @@ -197,13 +197,6 @@ class ExperimentController extends BaseController } } - public function expCancel() - { - ExperimentUtilities::cancel_experiment(Input::get("expId")); - - return Redirect::to('experiment/summary?expId=' . Input::get("expId")); - } - public function expChange() { //var_dump( Input::all() ); exit; http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/50e91170/app/routes.php ---------------------------------------------------------------------- diff --git a/app/routes.php b/app/routes.php index 6fc817b..4136655 100755 --- a/app/routes.php +++ b/app/routes.php @@ -108,8 +108,6 @@ Route::get("experiment/edit", "ExperimentController@editView"); Route::post("experiment/edit", "ExperimentController@editSubmit"); -Route::post("experiment/cancel", "ExperimentController@expCancel"); - Route::get("experiment/getQueueView", "ExperimentController@getQueueView"); Route::get("experiment/browse", "ExperimentController@browseView"); http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/50e91170/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 bd13668..062a7f8 100644 --- a/app/views/partials/experiment-info.blade.php +++ b/app/views/partials/experiment-info.blade.php @@ -239,18 +239,19 @@ @endif </div> <div class="btn-toolbar"> - <input name="launch" + <button name="launch" + type="submit" + class="btn btn-success" + title="Launch the experiment" @if ( !$expVal["editable"]) style="display: none" @endif> + Launch + </button> + <button name="cancel" type="submit" - class="btn btn-success" - value="Launch" - title="Launch the experiment" @if ( !$expVal["editable"]) style="display: none" @endif> - <a id="cancel_exp_link" href="{{URL::to('/') }}/experiment/cancel?expId={{ $experiment->experimentId }}" - class="btn btn-default" onclick="return confirm('Are you sure you want to cancel this experiment?')" - role="button" - title="Cancel experiment" @if (!$expVal["cancelable"]) style="display: none" @endif> + class="btn btn-default" onclick="return confirm('Are you sure you want to cancel this experiment?')" + title="Cancel experiment" @if (!$expVal["cancelable"]) style="display: none" @endif> <span class="glyphicon glyphicon-remove"></span> Cancel - </a> + </button> <input type="hidden" name="expId" value="{{ Input::get('expId') }}"/> <a href="{{URL::to('/') }}/experiment/edit?expId={{ $experiment->experimentId }}&savedExp=true" class="btn btn-default" @@ -263,7 +264,6 @@ <button name="update-sharing" type="submit" class="btn btn-primary" - value="Update Sharing" title="Update sharing settings"> <span class="glyphicon glyphicon-share"></span> Update Sharing
