diff --git a/module/story/control.php b/module/story/control.php index cbdd1190a0..f4d8c8c789 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -791,7 +791,7 @@ class story extends control $moduleID = $this->tree->getAllChildID($moduleID); } $stories = $this->story->getProjectStoryPairs($projectID, $productID, $moduleID, $type); - die(html::select('story' . $number, $stories, $storyID, 'class=select-1 onchange=setStoryRelated(' . $number . ');')); + die(html::select('story' . $number, $stories, $storyID, 'class=form-control onchange=setStoryRelated(' . $number . ');')); } /** diff --git a/module/story/js/batchcreate.js b/module/story/js/batchcreate.js new file mode 100644 index 0000000000..e4f7fcb8c0 --- /dev/null +++ b/module/story/js/batchcreate.js @@ -0,0 +1,11 @@ +$(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(); + $(select).val(value); + $(select).trigger("chosen:updated"); + } +}) diff --git a/module/story/view/activate.html.php b/module/story/view/activate.html.php index c26ca03b2f..6075f46eb6 100644 --- a/module/story/view/activate.html.php +++ b/module/story/view/activate.html.php @@ -22,7 +22,7 @@ - + diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php index adb386ff26..2662ccb7ea 100644 --- a/module/story/view/batchcreate.html.php +++ b/module/story/view/batchcreate.html.php @@ -18,7 +18,7 @@ -
story->assignedTo;?>closedBy, 'class="form-control"');?>closedBy, 'class="form-control chosen"');?>
story->comment;?>
+
@@ -26,8 +26,8 @@ - - + + @@ -36,8 +36,8 @@ - - + +
idAB;?>story->plan;?> story->title;?> story->spec;?>story->pri;?>story->estimate;?>story->pri;?>story->estimate;?> story->review;?>
diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php index 5eb2b7745f..cfe9d545d1 100644 --- a/module/story/view/batchedit.html.php +++ b/module/story/view/batchedit.html.php @@ -21,28 +21,27 @@ "> - +
- - + + - - - - - - + + + + + + - - - + + @@ -56,9 +55,9 @@ status == 'closed'):?> - + - + status == 'closed'):?> diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php index 34679a3d2f..038d69e846 100644 --- a/module/story/view/create.html.php +++ b/module/story/view/create.html.php @@ -25,12 +25,12 @@
idAB;?>story->module;?>story->planAB;?>story->module;?>story->planAB;?> story->title;?> story->estimateAB;?> priAB;?> story->source;?> story->status;?> story->stageAB;?>story->closedBy;?>story->closedReason;?> priAB;?> story->source;?> story->status;?> story->stageAB;?>story->closedBy;?>story->closedReason;?>
product], $stories[$storyID]->module, 'class=form-control');?>product], $stories[$storyID]->plan, 'class=form-control');?>product], $stories[$storyID]->module, "class='form-control chosen'");?>product], $stories[$storyID]->plan, "class='form-control chosen'");?> title, 'class=form-control'); ?> estimate, 'class=form-control'); ?> story->priList, $stories[$storyID]->pri, 'class=form-control');?> closedBy, 'class="form-control"');?>closedBy, "class='form-control chosen'");?> closedBy, 'class="form-control" disabled="disabled"');?>closedBy, 'class="form-control" disabled="disabled"');?>
story->product;?> - +
"; @@ -48,7 +48,7 @@
"; diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php index 894f9e91ec..4aaa4c323a 100644 --- a/module/story/view/edit.html.php +++ b/module/story/view/edit.html.php @@ -55,13 +55,13 @@ - + - + status == 'closed'):?> - + diff --git a/module/story/view/review.html.php b/module/story/view/review.html.php index 28faf2553f..897eabd6c0 100644 --- a/module/story/view/review.html.php +++ b/module/story/view/review.html.php @@ -53,7 +53,7 @@ var assignedTo = 'lastEditedBy ? print($story->lastEditedBy) : pri - + diff --git a/module/task/js/create.js b/module/task/js/create.js index c9887597c8..34e56e0d2b 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -110,7 +110,7 @@ function setStories(moduleID, projectID) $.get(link, function(stories) { var storyID = $('#story').val(); - if(!stories) stories = ''; + if(!stories) stories = ''; $('#story').replaceWith(stories); $('#story').val(storyID); setPreview();
story->product;?>product, 'class="form-control" onchange="loadProduct(this.value)";');?>product, 'class="form-control chosen" onchange="loadProduct(this.value)";');?>
story->module;?> module, 'class="form-control"'); + echo html::select('module', $moduleOptionMenu, $story->module, 'class="form-control chosen"'); if(count($moduleOptionMenu) == 1) { echo ""; @@ -75,7 +75,7 @@
story->plan;?> - plan, 'class=form-control'); + plan, "class='form-control chosen'"); if(count($plans) == 1) { echo ""; @@ -132,13 +132,13 @@ reviewedBy):?>
story->reviewedBy;?>reviewedBy), 'class="area-1" multiple');?>reviewedBy), 'class="form-control chosen" multiple');?>
story->closedBy;?>closedBy, 'class="form-control"');?>closedBy, 'class="form-control chosen"');?>
story->closedReason;?>
story->assignedTo;?>lastEditedBy ? $story->lastEditedBy : $story->openedBy, 'class=form-control');?>lastEditedBy ? $story->lastEditedBy : $story->openedBy, "class='form-control chosen'");?>
story->reviewedBy;?>