diff --git a/module/bug/config.php b/module/bug/config.php index a17eeb0748..5ad1aeee5d 100644 --- a/module/bug/config.php +++ b/module/bug/config.php @@ -1,4 +1,47 @@ bug = new stdClass(); + +$config->bug->create = new stdclass(); +$config->bug->edit = new stdclass(); +$config->bug->resolve = new stdclass(); +$config->bug->create->requiredFields = 'title,openedBuild'; +$config->bug->edit->requiredFields = $config->bug->create->requiredFields; +$config->bug->resolve->requiredFields = 'resolution'; + +$config->bug->batchEdit = new stdclass(); +$config->bug->batchEdit->columns = 9; + +$config->bug->list = new stdclass(); +$config->bug->list->allFields = 'id, module, project, story, task, + title, keywords, severity, pri, type, os, browser, hardware, + found, steps, status, activatedCount, confirmed, mailto, + openedBy, openedDate, openedBuild, + assignedTo, assignedDate, + resolvedBy, resolution, resolvedBuild, resolvedDate, + closedBy, closedDate, + duplicateBug, linkBug, + case, + lastEditedBy, + lastEditedDate'; +$config->bug->list->defaultFields = 'id,severity,pri,title,openedBy,assignedTo,resolvedBy,resolution'; + +$config->bug->list->exportFields = 'id, product, module, project, story, task, + title, keywords, severity, pri, type, os, browser, + steps, status, activatedCount, confirmed, mailto, + openedBy, openedDate, openedBuild, + assignedTo, assignedDate, + resolvedBy, resolution, resolvedBuild, resolvedDate, + closedBy, closedDate, + duplicateBug, linkBug, + case, + lastEditedBy, + lastEditedDate, files'; + +$config->bug->editor = new stdclass(); +$config->bug->editor->create = array('id' => 'steps', 'tools' => 'bugTools'); +$config->bug->editor->edit = array('id' => 'steps,comment', 'tools' => 'bugTools'); +$config->bug->editor->view = array('id' => 'comment', 'tools' => 'bugTools'); + global $lang; $config->bug->search['module'] = 'bug'; $config->bug->search['fields']['title'] = $lang->bug->title; @@ -81,41 +124,3 @@ $config->bug->search['params']['assignedDate'] = array('operator' => '>=', $config->bug->search['params']['resolvedDate'] = array('operator' => '>=', 'control' => 'input', 'values' => '', 'class' => 'date'); $config->bug->search['params']['closedDate'] = array('operator' => '>=', 'control' => 'input', 'values' => '', 'class' => 'date'); $config->bug->search['params']['lastEditedDate']= array('operator' => '>=', 'control' => 'input', 'values' => '', 'class' => 'date'); - -$config->bug->create = new stdclass(); -$config->bug->edit = new stdclass(); -$config->bug->resolve = new stdclass(); -$config->bug->create->requiredFields = 'title,openedBuild'; -$config->bug->edit->requiredFields = $config->bug->create->requiredFields; -$config->bug->resolve->requiredFields = 'resolution'; - -$config->bug->list = new stdclass(); -$config->bug->list->allFields = 'id, module, project, story, task, - title, keywords, severity, pri, type, os, browser, hardware, - found, steps, status, activatedCount, confirmed, mailto, - openedBy, openedDate, openedBuild, - assignedTo, assignedDate, - resolvedBy, resolution, resolvedBuild, resolvedDate, - closedBy, closedDate, - duplicateBug, linkBug, - case, - lastEditedBy, - lastEditedDate'; -$config->bug->list->defaultFields = 'id,severity,pri,title,openedBy,assignedTo,resolvedBy,resolution'; - -$config->bug->list->exportFields = 'id, product, module, project, story, task, - title, keywords, severity, pri, type, os, browser, - steps, status, activatedCount, confirmed, mailto, - openedBy, openedDate, openedBuild, - assignedTo, assignedDate, - resolvedBy, resolution, resolvedBuild, resolvedDate, - closedBy, closedDate, - duplicateBug, linkBug, - case, - lastEditedBy, - lastEditedDate, files'; - -$config->bug->editor = new stdclass(); -$config->bug->editor->create = array('id' => 'steps', 'tools' => 'bugTools'); -$config->bug->editor->edit = array('id' => 'steps,comment', 'tools' => 'bugTools'); -$config->bug->editor->view = array('id' => 'comment', 'tools' => 'bugTools'); diff --git a/module/bug/control.php b/module/bug/control.php index d35ba36530..78658324be 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -509,15 +509,14 @@ class bug extends control /* Initialize vars.*/ $bugs = $this->dao->select('*')->from(TABLE_BUG)->where('id')->in($bugIDList)->fetchAll('id'); - $product = $this->product->getByID($productID); - $columns = 9; - $showSuhosinInfo = false; + $product = $this->product->getByID($productID); /* Set product menu. */ $this->bug->setMenu($this->products, $productID); /* Judge whether the editedTasks is too large and set session. */ - $showSuhosinInfo = $this->loadModel('common')->judgeSuhosinSetting(count($bugs), $columns); + $showSuhosinInfo = false; + $showSuhosinInfo = $this->loadModel('common')->judgeSuhosinSetting(count($bugs), $this->config->bug->batchEdit->columns); $this->app->session->set('showSuhosinInfo', $showSuhosinInfo); if($showSuhosinInfo) $this->view->suhosinInfo = $this->lang->suhosinInfo; diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php index 10b69a1e8e..a38e5f45fe 100644 --- a/module/bug/view/batchedit.html.php +++ b/module/bug/view/batchedit.html.php @@ -51,9 +51,9 @@ -