diff --git a/module/common/view/pastetext.html.php b/module/common/view/pastetext.html.php index 806f4af149..70bf23ecb4 100644 --- a/module/common/view/pastetext.html.php +++ b/module/common/view/pastetext.html.php @@ -28,6 +28,7 @@ $(function() var lastIndex = parseInt($formTbody.find('tr:last > td:first').text()); var $newRow = $(rowTpl.replace(/%s/g, lastIndex + 1)); $newRow.find('.chosen').chosen(); + $newRow.find('.iframe').modalTrigger({iframe:true});; $newRow.find('[data-provide="colorpicker-later"]').colorPicker(); $newRow.datepickerAll(); $formTbody.append($newRow); diff --git a/module/task/js/batchcreate.js b/module/task/js/batchcreate.js index f4c4a0202d..303a6e7adc 100755 --- a/module/task/js/batchcreate.js +++ b/module/task/js/batchcreate.js @@ -74,7 +74,7 @@ function copyStoryTitle(num) function setStoryRelated(num) { var storyID = $('#story' + num).val(); - if(storyID) + if(storyID && storyID != 'ditto') { var link = createLink('story', 'ajaxGetInfo', 'storyID=' + storyID); $.getJSON(link, function(storyInfo) @@ -86,6 +86,18 @@ function setStoryRelated(num) $('#storyPri' + num).val(storyInfo.pri); $('#storyDesc' + num).val(storyInfo.spec); }); + + storyLink = createLink('story', 'view', "storyID=" + storyID); + var concat = config.requestType != 'GET' ? '?' : '&'; + storyLink = storyLink + concat + 'onlybody=yes'; + $('#preview' + num).removeAttr('disabled'); + $('#preview' + num).attr('href', storyLink); + } + else + { + storyLink = '#'; + $('#preview' + num).attr('disabled', true); + $('#preview' + num).attr('href', storyLink); } } diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php index de9ac54660..b2e93ec12c 100644 --- a/module/task/view/batchcreate.html.php +++ b/module/task/view/batchcreate.html.php @@ -64,11 +64,11 @@ task->name;?> typeAB;?> - '>task->assignedTo;?> + '>task->assignedTo;?> '>task->estimateAB;?> '>task->estStarted;?> '>task->deadline;?> - '>task->desc;?> + '>task->desc;?> '>task->pri;?> @@ -106,6 +106,7 @@
+ @@ -158,6 +159,7 @@
+