diff --git a/module/bug/model.php b/module/bug/model.php index f8fb477ad6..994eaca402 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -135,6 +135,7 @@ class bugModel extends model $bug->module = $data->modules[$i]; $bug->project = $data->projects[$i]; $bug->openedBuild = implode(',', $data->openedBuilds[$i]); + $bug->color = $data->color[$i]; $bug->title = $data->title[$i]; $bug->steps = nl2br($data->stepses[$i]); $bug->type = $data->types[$i]; diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php index 462636e75d..e3083c0e16 100644 --- a/module/bug/view/batchcreate.html.php +++ b/module/bug/view/batchcreate.html.php @@ -81,7 +81,12 @@ foreach(explode(',', $showFields) as $field) ' style='overflow:visible'> ' style='overflow:visible'> - + +
+ bug->colorTag}' data-update-text='#title\\[{$i}\\]'");?> + +
+ '> '> bug->typeList, $type, "class='form-control'");?> '> bug->priList, $pri, "class='form-control'");?> @@ -108,7 +113,12 @@ foreach(explode(',', $showFields) as $field) ' style='overflow:visible'> ' style='overflow:visible'> - + +
+ bug->colorTag}' data-update-text='#title\\[{$i}\\]'");?> + +
+ '> '> bug->typeList, $type, "class='form-control'");?> '> bug->priList, $pri, "class='form-control'");?> @@ -131,7 +141,12 @@ foreach(explode(',', $showFields) as $field) ' style='overflow:visible'> ' style='overflow:visible'> - + +
+ bug->colorTag}' data-update-text='#title\\[%s\\]'");?> + +
+ '> '> bug->typeList, '', "class='form-control'");?> '> bug->priList, '', "class='form-control'");?> diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php index de16a86954..9c7140bb75 100644 --- a/module/bug/view/batchedit.html.php +++ b/module/bug/view/batchedit.html.php @@ -71,7 +71,7 @@ $columns = count($visibleFields) + 2; >pri, 'class=form-control');?>
- color, "data-provide='colorpicker' data-wrapper='input-group-btn fix-border-right' data-pull-menu-right='false' data-btn-tip='{$lang->bug->colorTag}' data-update-text='#names\\[{$bugID}\\]'");?> + color, "data-provide='colorpicker' data-wrapper='input-group-btn fix-border-right' data-pull-menu-right='false' data-btn-tip='{$lang->bug->colorTag}' data-update-text='#titles\\[{$bugID}\\]'");?> title, 'class=form-control');?>
diff --git a/module/task/css/batchcreate.css b/module/task/css/batchcreate.css index 5a3f69b9d9..631234f606 100644 --- a/module/task/css/batchcreate.css +++ b/module/task/css/batchcreate.css @@ -2,8 +2,8 @@ .outer .chosen-container-single {max-width: 160px; border-radius: 0} .outer .chosen-container-single .chosen-single {border-radius: 2px 0 0 2px;} .outer .chosen-container-single + .input-group-btn > .btn {border-left: 0} -.outer .input-group {display: block; padding-right: 29px; max-width: 100%;} -.outer .input-group-btn {display: block; position: absolute; right: 0; width: 29px; top: 0} +.outer .input-group > span {display: block; padding-right: 29px; max-width: 100%;} +.outer .input-group-btn > a {display: block; position: absolute; right: 0; width: 29px; top: 0} .chosen-container[id^="story"] {width: 200px;} .chosen-container[id^="story"] .chosen-drop {min-width: 450px;!important} .chosen-container[id^="module"] .chosen-drop {min-width: 400px;!important} diff --git a/module/task/model.php b/module/task/model.php index 7dd419759d..e38d8e89c7 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -145,6 +145,7 @@ class taskModel extends model $data[$i]->type = $tasks->type[$i]; $data[$i]->module = $tasks->module[$i]; $data[$i]->assignedTo = $tasks->assignedTo[$i]; + $data[$i]->color = $tasks->color[$i]; $data[$i]->name = $tasks->name[$i]; $data[$i]->desc = nl2br($tasks->desc[$i]); $data[$i]->pri = $tasks->pri[$i]; diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php index c3280b93c6..4c4a651dd9 100644 --- a/module/task/view/batchcreate.html.php +++ b/module/task/view/batchcreate.html.php @@ -73,13 +73,18 @@ foreach(explode(',', $showFields) as $field) style='overflow:visible'>id, $i)'")?> style='overflow: visible'>
- - - - + + + + +
+ + +
+ task->colorTag}' data-update-text='#name\\[{$i}\\]'");?> +
- task->typeList, $type, 'class=form-control');?> style='overflow:visible'> > @@ -105,7 +110,12 @@ foreach(explode(',', $showFields) as $field)
- + +
+ task->colorTag}' data-update-text='#name\\[%s\\]'");?> + +
+ task->typeList, $type, 'class=form-control');?> style='overflow:visible'> > diff --git a/module/testcase/model.php b/module/testcase/model.php index d5d8173a4d..fb57c41396 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -131,6 +131,7 @@ class testcaseModel extends model $data[$i]->pri = $cases->pri[$i]; $data[$i]->stage = empty($cases->stage[$i]) ? '' : implode(',', $cases->stage[$i]); $data[$i]->story = $storyID ? $storyID : $cases->story[$i]; + $data[$i]->color = $cases->color[$i]; $data[$i]->title = $cases->title[$i]; $data[$i]->precondition = $cases->precondition[$i]; $data[$i]->keywords = $cases->keywords[$i]; diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php index 9fbb84b672..7ac3518fbc 100644 --- a/module/testcase/view/batchcreate.html.php +++ b/module/testcase/view/batchcreate.html.php @@ -67,7 +67,12 @@ foreach(explode(',', $showFields) as $field) ' style='overflow:visible'> ' style='overflow:visible'> id : '', 'class="form-control chosen"');?> - + +
+ testcase->colorTag}' data-update-text='#title\\[{$i}\\]'");?> + +
+ testcase->typeList, $type, "class=form-control");?> '> testcase->priList, $pri, "class=form-control");?> '> @@ -86,7 +91,12 @@ foreach(explode(',', $showFields) as $field) %s ' style='overflow:visible'> ' style='overflow:visible'> - + +
+ testcase->colorTag}' data-update-text='#title\\[%s\\]'");?> + +
+ testcase->typeList, $type, "class=form-control");?> '> testcase->priList, $pri, "class=form-control");?> '>