diff --git a/module/story/js/batchcreate.js b/module/story/js/batchcreate.js index e4f7fcb8c0..7a7a4c871a 100644 --- a/module/story/js/batchcreate.js +++ b/module/story/js/batchcreate.js @@ -3,8 +3,8 @@ $(document).on('click', '.chosen-with-drop', function() var select = $(this).prev('select'); if($(select).val() == 'same') { - var index = $(select).parent().index(); - var value = $(select).parent().parent().prev('tr').find('td').eq(index).find('select').val(); + var index = $(select).parents('td').index(); + var value = $(select).parents('tr').prev('tr').find('td').eq(index).find('select').val(); $(select).val(value); $(select).trigger("chosen:updated"); } diff --git a/module/task/js/batchcreate.js b/module/task/js/batchcreate.js index 6b1fbe3333..8bd81f5d7b 100755 --- a/module/task/js/batchcreate.js +++ b/module/task/js/batchcreate.js @@ -40,3 +40,15 @@ function setStoryRelated(num) }); } } + +$(document).on('click', '.chosen-with-drop', function() +{ + var select = $(this).prev('select'); + if($(select).val() == 'ditto') + { + var index = $(select).parents('td').index(); + var value = $(select).parents('tr').prev('tr').find('td').eq(index).find('select').val(); + $(select).val(value); + $(select).trigger("chosen:updated"); + } +}) diff --git a/module/task/js/edit.js b/module/task/js/edit.js index ed3cb924c7..3127f054fe 100644 --- a/module/task/js/edit.js +++ b/module/task/js/edit.js @@ -18,7 +18,7 @@ function loadAll(projectID) firstChoice = confirm(confirmChangeProject); changeProjectConfirmed = true; // Only notice the user one time. } - if(changeProjectConfirmed || firstChoice) + if(changeProjectConfirmed && firstChoice) { loadModuleMenu(projectID); loadProjectStories(projectID); @@ -36,7 +36,7 @@ function loadAll(projectID) function loadModuleMenu(projectID) { link = createLink('tree', 'ajaxGetOptionMenu', 'rootID=' + projectID + '&viewtype=task'); - $('#moduleIdBox').load(link); + $('#moduleIdBox').load(link, function(){$('#module').chosen(defaultChosenOptions);}); } /** @@ -49,7 +49,7 @@ function loadModuleMenu(projectID) function loadProjectStories(projectID) { link = createLink('story', 'ajaxGetProjectStories', 'projectID=' + projectID + '&productID=0&moduleID=0&storyID=' + oldStoryID); - $('#storyIdBox').load(link, function(){$('#story').chosen();}); + $('#storyIdBox').load(link, function(){$('#story').chosen(defaultChosenOptions);}); } /** diff --git a/module/task/view/activate.html.php b/module/task/view/activate.html.php index 8220bb0aff..249dcb37c9 100644 --- a/module/task/view/activate.html.php +++ b/module/task/view/activate.html.php @@ -24,7 +24,7 @@
| task->assignedTo;?> | -finishedBy, "class='form-control'");?> | + | finishedBy, "class='form-control chosen'");?> | |
|---|---|---|---|---|
| task->left;?> | diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php index a685b67dc3..7631b23c6b 100644 --- a/module/task/view/batchcreate.html.php +++ b/module/task/view/batchcreate.html.php @@ -20,12 +20,12 @@