diff --git a/module/execution/js/batchedit.js b/module/execution/js/batchedit.js index e7644bfab4..79785b1512 100644 --- a/module/execution/js/batchedit.js +++ b/module/execution/js/batchedit.js @@ -1,5 +1,6 @@ function changeProject(obj, executionID, projectID) { + var lastSelected = $(obj).data('lastselected'); var $td = $(obj).closest('td'); if($td.find('[id^="syncStories"]').length == 0) @@ -12,6 +13,12 @@ function changeProject(obj, executionID, projectID) if(!confirmVal) { - $(obj).val(projectID).trigger("chosen:updated"); + $(obj).val(lastSelected).trigger("chosen:updated"); + return false; } -}; + else + { + lastSelected = $(obj).val(); + $(obj).data("lastselected", lastSelected); + } +} diff --git a/module/execution/js/edit.js b/module/execution/js/edit.js index fb7987b974..276c362e01 100644 --- a/module/execution/js/edit.js +++ b/module/execution/js/edit.js @@ -64,6 +64,7 @@ $(function() } }); }) +var lastProjectID = $("#project").val(); function changeProject(projectID) { @@ -77,7 +78,9 @@ function changeProject(projectID) if(!confirmVal) { - $('#project').val(projectID).trigger("chosen:updated"); - console.log($('#project').val(projectID)); + $('#project').val(lastProjectID).trigger("chosen:updated"); + return false; } + + lastProjectID = projectID; }; diff --git a/module/execution/view/batchedit.html.php b/module/execution/view/batchedit.html.php index 5520f67890..2dbc771ad0 100755 --- a/module/execution/view/batchedit.html.php +++ b/module/execution/view/batchedit.html.php @@ -83,7 +83,7 @@ systemMode == 'new' and isset($project) and $project->model == 'scrum'):?> - project, "class='form-control picker-select' onchange='changeProject(this, $executionID, {$executions[$executionID]->project})'");?> + project, "class='form-control picker-select' data-lastselected='{$executions[$executionID]->project}' onchange='changeProject(this, $executionID, {$executions[$executionID]->project})'");?> name, "class='form-control'");?> code, "class='form-control'");?> diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php index 0397a0255f..6172a701b8 100644 --- a/module/execution/view/edit.html.php +++ b/module/execution/view/edit.html.php @@ -28,7 +28,7 @@ systemMode == 'new'):?> execution->projectName;?> - project, "class='form-control chosen' onchange='changeProject($execution->project)' required");?> + project, "class='form-control chosen' onchange='changeProject(this.value)' required");?>