diff --git a/module/bug/ui/batchcreate.html.php b/module/bug/ui/batchcreate.html.php index ea3bbcad9f..c62f91bcc1 100644 --- a/module/bug/ui/batchcreate.html.php +++ b/module/bug/ui/batchcreate.html.php @@ -184,7 +184,7 @@ $items[] = array 'hidden' => zget($visibleFields, 'pri', true, false), 'control' => 'priPicker', 'items' => $lang->bug->priList, - 'value' => '', + 'value' => 3, 'width' => '80px', 'required' => isset($requiredFields['pri']), 'ditto' => true, @@ -212,6 +212,7 @@ $items[] = array 'control' => 'picker', 'items' => $lang->bug->osList, 'width' => '200px', + 'multiple' => true, 'required' => isset($requiredFields['os']), ); @@ -224,6 +225,7 @@ $items[] = array 'control' => 'picker', 'items' => $lang->bug->browserList, 'width' => '200px', + 'multiple' => true, 'required' => isset($requiredFields['browser']), ); diff --git a/module/bug/zen.php b/module/bug/zen.php index a9bded88e6..274b2bf145 100644 --- a/module/bug/zen.php +++ b/module/bug/zen.php @@ -1280,11 +1280,8 @@ class bugZen extends bug { $bug->openedBy = $this->app->user->account; $bug->openedDate = helper::now(); - $bug->openedBuild = implode(',', $bug->openedBuild); $bug->product = $productID; $bug->steps = nl2br($bug->steps); - $bug->os = implode(',', $bug->os); - $bug->browser = implode(',', $bug->browser); /* Assign the bug to the person in charge of the module. */ if(!empty($moduleOwners[$bug->module])) diff --git a/module/tree/model.php b/module/tree/model.php index 8a7e448139..7a8588d631 100644 --- a/module/tree/model.php +++ b/module/tree/model.php @@ -85,7 +85,7 @@ class treeModel extends model if(($type == 'feedback' or $type == 'ticket') and strpos($param, 'noproduct') === false and isset($syncConfig[$rootID])) $type = 'story,' . $type; if($this->isMergeModule($rootID, $type)) { - return $this->dao->select('id, name, root, branch, grade, path, parent')->from(TABLE_MODULE) + return $this->dao->select('id, name, root, branch, grade, path, parent, owner')->from(TABLE_MODULE) ->where('root')->eq((int)$rootID) ->beginIF($type == 'task')->andWhere('type')->eq('task')->fi() ->beginIF($type != 'task')->andWhere('type')->in("story,$type")->fi()