todo->pri?>
diff --git a/module/bug/config.php b/module/bug/config.php
index 038135ce14..ea68bf02c4 100644
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -165,13 +165,18 @@ $config->bug->search['params']['lastEditedDate']= array('operator' => '=',
$config->bug->search['params']['deadline'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->bug->datatable = new stdclass();
-$config->bug->datatable->defaultField = array('id', 'pri', 'title', 'severity', 'status', 'openedBy', 'openedDate', 'assignedTo', 'resolution', 'actions');
+$config->bug->datatable->defaultField = array('id', 'severity', 'pri', 'title', 'status', 'openedBy', 'openedDate', 'assignedTo', 'resolution', 'actions');
$config->bug->datatable->fieldList['id']['title'] = 'idAB';
$config->bug->datatable->fieldList['id']['fixed'] = 'left';
$config->bug->datatable->fieldList['id']['width'] = '70';
$config->bug->datatable->fieldList['id']['required'] = 'yes';
+$config->bug->datatable->fieldList['severity']['title'] = 'severityAB';
+$config->bug->datatable->fieldList['severity']['fixed'] = 'left';
+$config->bug->datatable->fieldList['severity']['width'] = '60';
+$config->bug->datatable->fieldList['severity']['required'] = 'no';
+
$config->bug->datatable->fieldList['pri']['title'] = 'P';
$config->bug->datatable->fieldList['pri']['fixed'] = 'left';
$config->bug->datatable->fieldList['pri']['width'] = '50';
@@ -182,11 +187,6 @@ $config->bug->datatable->fieldList['title']['fixed'] = 'left';
$config->bug->datatable->fieldList['title']['width'] = 'auto';
$config->bug->datatable->fieldList['title']['required'] = 'yes';
-$config->bug->datatable->fieldList['severity']['title'] = 'severityAB';
-$config->bug->datatable->fieldList['severity']['fixed'] = 'left';
-$config->bug->datatable->fieldList['severity']['width'] = '60';
-$config->bug->datatable->fieldList['severity']['required'] = 'no';
-
$config->bug->datatable->fieldList['branch']['title'] = 'branch';
$config->bug->datatable->fieldList['branch']['fixed'] = 'left';
$config->bug->datatable->fieldList['branch']['width'] = '100';
diff --git a/module/bug/control.php b/module/bug/control.php
index 47491ef04b..31261e6253 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -22,6 +22,7 @@ class bug extends control
public function __construct($moduleName = '', $methodName = '')
{
parent::__construct($moduleName, $methodName);
+ $products = array();
$this->loadModel('product');
$this->loadModel('tree');
$this->loadModel('user');
@@ -296,7 +297,8 @@ class bug extends control
if(defined('RUN_MODE') && RUN_MODE == 'api') $this->send(array('status' => 'success', 'data' => $bugID));
- $location = $this->createLink('bug', 'browse', "productID={$this->post->product}&branch=$branch&type=byModule¶m={$this->post->module}");
+ setcookie('bugModule', (int)$this->post->module, 0, $this->config->webRoot);
+ $location = $this->createLink('bug', 'browse', "productID={$this->post->product}&branch=$branch&browseType=unclosed¶m=0&orderBy=id_desc");
if($this->app->getViewType() == 'xhtml') $location = $this->createLink('bug', 'view', "bugID=$bugID");
$response['locate'] = $location;
$this->send($response);
@@ -392,6 +394,9 @@ class bug extends control
$moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'bug', $startModuleID = 0, $branch);
if(empty($moduleOptionMenu)) die(js::locate(helper::createLink('tree', 'browse', "productID=$productID&view=story")));
+ $productList = $this->loadModel('block')->getProducts('noclosed', '');
+ foreach($productList as $product) $products[$product->id] = $product->name;
+
/* Set custom. */
foreach(explode(',', $this->config->bug->list->customCreateFields) as $field) $customFields[$field] = $this->lang->bug->$field;
$this->view->customFields = $customFields;
@@ -401,6 +406,7 @@ class bug extends control
$this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
$this->view->position[] = $this->lang->bug->create;
+ $this->view->products = $products;
$this->view->productID = $productID;
$this->view->productName = $this->products[$productID];
$this->view->moduleOptionMenu = $moduleOptionMenu;
@@ -544,6 +550,7 @@ class bug extends control
/* Get product info. */
$productID = $bug->product;
$productName = $this->products[$productID];
+ $branches = $this->session->currentProductType == 'normal' ? array() : $this->loadModel('branch')->getPairs($bug->product);
/* Header and positon. */
$this->view->title = "BUG #$bug->id $bug->title - " . $this->products[$productID];
@@ -553,9 +560,11 @@ class bug extends control
/* Assign. */
$this->view->productID = $productID;
$this->view->productName = $productName;
+ $this->view->branches = $branches;
$this->view->modulePath = $this->tree->getParents($bug->module);
+ $this->view->bugModule = empty($bug->module) ? '' : $this->tree->getById($bug->module);
$this->view->bug = $bug;
- $this->view->branchName = $this->session->currentProductType == 'normal' ? '' : $this->loadModel('branch')->getById($bug->branch, $bug->product);
+ $this->view->branchName = $this->session->currentProductType == 'normal' ? '' : zget($branches, $bug->branch, '');
$this->view->users = $this->user->getPairs('noletter');
$this->view->actions = $this->action->getList('bug', $bugID);
$this->view->builds = $this->loadModel('build')->getProductBuildPairs($productID, $branch = 0, $params = '');
@@ -1613,7 +1622,7 @@ class bug extends control
}
else
{
- $browseType = $this->lang->bug->moreSelects[$browseType];
+ $browseType = isset($this->lang->bug->moreSelects[$browseType]) ? $this->lang->bug->moreSelects[$browseType] : null;
}
$this->view->fileName = $productName . $this->lang->dash . $browseType . $fileName;
diff --git a/module/bug/css/browse.css b/module/bug/css/browse.css
index 733ad2b51c..68bad5ec71 100644
--- a/module/bug/css/browse.css
+++ b/module/bug/css/browse.css
@@ -3,6 +3,7 @@
.tree .closed, .tree .closed a{color:#003366; text-decoration:none;}
.confirm0 {color:gray; font-size:9px}
.confirm1 {color:green; font-size:9px}
+td.delayed{color:#fff; background: #e84e0f!important;}
.datatable-wrapper .table-datatable .datatable-row td {height:37px;}
diff --git a/module/bug/js/x.view.js b/module/bug/js/x.view.js
index 4f0756d4f4..d57019c9b3 100644
--- a/module/bug/js/x.view.js
+++ b/module/bug/js/x.view.js
@@ -1,5 +1,6 @@
$(function()
{
+ $('.main-actions-holder').css('height', '0px');
var $xuanAction = "
";
$('.main-col div.main-actions .btn-toolbar a').each(function(){
var $that = $(this);
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index 37eb507e2f..c40cc1f6d8 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -42,6 +42,7 @@ $lang->bug->toTask = 'Convert to Task';
$lang->bug->toStory = 'Convert to Story';
$lang->bug->mailto = 'Mail To';
<<<<<<< HEAD
+<<<<<<< HEAD
$lang->bug->openedBy = 'Created by';
$lang->bug->openedDate = 'Created';
$lang->bug->openedDateAB = 'Created';
@@ -50,10 +51,13 @@ $lang->bug->assignedTo = 'To';
$lang->bug->assignBug = 'Assignee';
=======
$lang->bug->openedBy = 'Creator';
+=======
+$lang->bug->openedBy = 'Created by';
+>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->bug->openedDate = 'Created';
$lang->bug->openedDateAB = 'Created';
$lang->bug->openedBuild = 'Open Build';
-$lang->bug->assignedTo = 'AssignToMe';
+$lang->bug->assignedTo = 'Assign To';
$lang->bug->assignBug = 'Assign To';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->bug->assignedToAB = 'To';
@@ -69,7 +73,7 @@ $lang->bug->deadline = 'Deadline';
$lang->bug->plan = 'Plan';
$lang->bug->closedBy = 'Closed By';
$lang->bug->closedDate = 'Closed';
-$lang->bug->duplicateBug = 'Duplicate';
+$lang->bug->duplicateBug = 'Duplicate Bug ID';
$lang->bug->lastEditedBy = 'Edited By';
$lang->bug->linkBug = 'Linked Bug';
$lang->bug->linkBugs = 'Link Bug';
@@ -142,27 +146,35 @@ $lang->bug->needConfirm = 'ChangedStory';
$lang->bug->needConfirm = 'Story Changed';
>>>>>>> d3fa148cb3d0ea19eb92b37374b0ec4e2a64ec6f
$lang->bug->allProduct = 'All' . $lang->productCommon;
+<<<<<<< HEAD
$lang->bug->my = 'Mine';
$lang->bug->yesterdayResolved = 'Resolved Yesterday ';
$lang->bug->yesterdayConfirmed = 'Confirmed Yesterday ';
$lang->bug->yesterdayClosed = 'Closed Yesterday ';
+=======
+$lang->bug->my = 'My';
+$lang->bug->yesterdayResolved = 'Bug Resolved Yesterday ';
+$lang->bug->yesterdayConfirmed = 'Bug Confirmed Yesterday ';
+$lang->bug->yesterdayClosed = 'Bug Closed Yesterday ';
+>>>>>>> 58a5ce3d921a17cce37484db7696956508f5d454
$lang->bug->assignToMeAB = 'AssignToMe';
$lang->bug->openedByMeAB = 'CreateByMe';
$lang->bug->resolvedByMeAB = 'ResolveByMe';
-$lang->bug->ditto = 'Ditto';
-$lang->bug->dittoNotice = 'This bug is not linked to the same product as the last one!';
-$lang->bug->noAssigned = 'Assign';
-$lang->bug->noBug = 'No bugs. ';
-$lang->bug->noModule = '
You have no modules.
Manage now
';
+$lang->bug->ditto = 'Ditto';
+$lang->bug->dittoNotice = 'This bug is not linked to the same product as the last one!';
+$lang->bug->noAssigned = 'Assign';
+$lang->bug->noBug = 'No bugs. ';
+$lang->bug->noModule = '
You have no modules.
Manage now
';
+$lang->bug->delayWarning = "
Delay %s days ";
/* 页面标签。*/
$lang->bug->lblAssignedTo = 'Assignee';
$lang->bug->lblMailto = 'Mail To';
$lang->bug->lblLastEdited = 'Last Edited';
$lang->bug->lblResolved = 'Resolved By';
-$lang->bug->allUsers = 'Load All User';
+$lang->bug->allUsers = 'All Users';
$lang->bug->allBuilds = 'All';
$lang->bug->createBuild = 'New';
@@ -402,7 +414,7 @@ $lang->bug->action->linkrelatedbug = array('main' => '$date, linked by
bug->action->unlinkrelatedbug = array('main' => '$date, unlinked by $actor from Bug $extra .');
$lang->bug->placeholder = new stdclass();
-$lang->bug->placeholder->chooseBuilds = 'Choose Build...';
+$lang->bug->placeholder->chooseBuilds = 'Select Build...';
$lang->bug->placeholder->newBuildName = 'New build Name';
$lang->bug->featureBar['browse']['all'] = $lang->bug->allBugs;
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index cc0f4cdb36..05d85d7f23 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -128,11 +128,12 @@ $lang->bug->assignToMeAB = '指派给我';
$lang->bug->openedByMeAB = '由我创建';
$lang->bug->resolvedByMeAB = '由我解决';
-$lang->bug->ditto = '同上';
-$lang->bug->dittoNotice = '该bug与上一bug不属于同一产品！';
-$lang->bug->noAssigned = '未指派';
-$lang->bug->noBug = '暂时没有Bug。';
-$lang->bug->noModule = '您现在还没有模块信息
请维护测试模块
';
+$lang->bug->ditto = '同上';
+$lang->bug->dittoNotice = '该bug与上一bug不属于同一产品！';
+$lang->bug->noAssigned = '未指派';
+$lang->bug->noBug = '暂时没有Bug。';
+$lang->bug->noModule = '您现在还没有模块信息
请维护测试模块
';
+$lang->bug->delayWarning = " 延期%s天 ";
/* 页面标签。*/
$lang->bug->lblAssignedTo = '当前指派';
diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index 593b8613c1..ef6493b062 100644
--- a/module/bug/lang/zh-tw.php
+++ b/module/bug/lang/zh-tw.php
@@ -128,11 +128,12 @@ $lang->bug->assignToMeAB = '指派給我';
$lang->bug->openedByMeAB = '由我創建';
$lang->bug->resolvedByMeAB = '由我解決';
-$lang->bug->ditto = '同上';
-$lang->bug->dittoNotice = '該bug與上一bug不屬於同一產品！';
-$lang->bug->noAssigned = '未指派';
-$lang->bug->noBug = '暫時沒有Bug。';
-$lang->bug->noModule = '您現在還沒有模組信息
請維護測試模組
';
+$lang->bug->ditto = '同上';
+$lang->bug->dittoNotice = '該bug與上一bug不屬於同一產品！';
+$lang->bug->noAssigned = '未指派';
+$lang->bug->noBug = '暫時沒有Bug。';
+$lang->bug->noModule = '您現在還沒有模組信息
請維護測試模組
';
+$lang->bug->delayWarning = " 延期%s天 ";
/* 頁面標籤。*/
$lang->bug->lblAssignedTo = '當前指派';
diff --git a/module/bug/model.php b/module/bug/model.php
index 68cb2ba965..53075b9a37 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -134,8 +134,8 @@ class bugModel extends model
{
$now = helper::now();
$bug = fixer::input('post')
- ->add('openedBy', $this->app->user->account)
- ->add('openedDate', $now)
+ ->setDefault('openedBy', $this->app->user->account)
+ ->setDefault('openedDate', $now)
->setDefault('project,story,task', 0)
->setDefault('openedBuild', '')
->setDefault('deadline', '0000-00-00')
@@ -360,7 +360,7 @@ class bugModel extends model
}
/**
- * Check delay bug.
+ * Check delay bugs.
*
* @param array $bugs
* @access public
@@ -368,27 +368,38 @@ class bugModel extends model
*/
public function checkDelayBugs($bugs)
{
- foreach ($bugs as $bug)
- {
- // Delayed or not?.
- if($bug->deadline != '0000-00-00')
- {
- if(substr($bug->resolvedDate, 0, 10) != '0000-00-00')
- {
- $delay = helper::diffDate(substr($bug->resolvedDate, 0, 10), $bug->deadline);
- }
- elseif($bug->status == 'active')
- {
- $delay = helper::diffDate(helper::today(), $bug->deadline);
- }
-
- if(isset($delay) and $delay > 0) $bug->delay = $delay;
- }
- }
+ foreach ($bugs as $bug) $bug = $this->checkDelayBug($bug);
return $bugs;
}
+ /**
+ * Check delay bug.
+ *
+ * @param array $bug
+ * @access public
+ * @return array
+ */
+ public function checkDelayBug($bug)
+ {
+ // Delayed or not?.
+ if($bug->deadline != '0000-00-00')
+ {
+ if($bug->resolvedDate and substr($bug->resolvedDate, 0, 10) != '0000-00-00')
+ {
+ $delay = helper::diffDate(substr($bug->resolvedDate, 0, 10), $bug->deadline);
+ }
+ elseif($bug->status == 'active')
+ {
+ $delay = helper::diffDate(helper::today(), $bug->deadline);
+ }
+
+ if(isset($delay) and $delay > 0) $bug->delay = $delay;
+ }
+
+ return $bug;
+ }
+
/**
* Get bugs of a module.
*
@@ -469,7 +480,7 @@ class bugModel extends model
$bug->files = $this->loadModel('file')->getByObject('bug', $bugID);
- return $bug;
+ return $this->checkDelayBug($bug);
}
/**
@@ -502,7 +513,6 @@ class bugModel extends model
{
return $this->dao->select('*')->from(TABLE_BUG)
->where('status')->eq('active')
- ->andWhere('toTask')->eq(0)
->andWhere('tostory')->eq(0)
->beginIF(!empty($products))->andWhere('product')->in($products)->fi()
->beginIF($branch)->andWhere('branch')->in("0,$branch")->fi()
@@ -601,9 +611,9 @@ class bugModel extends model
->setDefault('plan', 0)
->setDefault('deadline', '0000-00-00')
->setDefault('resolvedDate', '0000-00-00 00:00:00')
- ->setIF(strpos($this->config->bug->edit->requiredFields, 'deadline') !== false, 'deadline', $this->post->deadline)
- ->add('lastEditedBy', $this->app->user->account)
+ ->setDefault('lastEditedBy', $this->app->user->account)
->add('lastEditedDate', $now)
+ ->setIF(strpos($this->config->bug->edit->requiredFields, 'deadline') !== false, 'deadline', $this->post->deadline)
->join('openedBuild', ',')
->join('mailto', ',')
->join('linkBug', ',')
@@ -909,15 +919,15 @@ class bugModel extends model
$now = helper::now();
$oldBug = $this->getById($bugID);
$bug = fixer::input('post')
- ->add('resolvedBy', $this->app->user->account)
- ->add('status', 'resolved')
- ->add('confirmed', 1)
- ->add('assignedDate', $now)
- ->add('lastEditedBy', $this->app->user->account)
- ->add('lastEditedDate', $now)
- ->setDefault('resolvedDate', $now)
- ->setDefault('duplicateBug', 0)
- ->setDefault('assignedTo', $oldBug->openedBy)
+ ->add('status', 'resolved')
+ ->add('confirmed', 1)
+ ->setDefault('lastEditedBy', $this->app->user->account)
+ ->setDefault('lastEditedDate', $now)
+ ->setDefault('resolvedBy', $this->app->user->account)
+ ->setDefault('assignedDate', $now)
+ ->setDefault('resolvedDate', $now)
+ ->setDefault('duplicateBug', 0)
+ ->setDefault('assignedTo', $oldBug->openedBy)
->remove('comment,files,labels')
->get();
@@ -1112,8 +1122,11 @@ class bugModel extends model
$oldBug = $this->getById($bugID);
$now = helper::now();
$bug = fixer::input('post')
- ->setDefault('assignedTo', $oldBug->resolvedBy)
- ->add('assignedDate', $now)
+ ->setDefault('assignedTo', $oldBug->resolvedBy)
+ ->setDefault('assignedDate', $now)
+ ->setDefault('lastEditedBy', $this->app->user->account)
+ ->setDefault('lastEditedDate', $now)
+ ->setDefault('activatedDate', $now)
->add('resolution', '')
->add('status', 'active')
->add('resolvedDate', '0000-00-00')
@@ -1124,9 +1137,6 @@ class bugModel extends model
->add('duplicateBug', 0)
->add('toTask', 0)
->add('toStory', 0)
- ->add('lastEditedBy', $this->app->user->account)
- ->add('lastEditedDate', $now)
- ->add('activatedDate', $now)
->join('openedBuild', ',')
->remove('comment,files,labels')
->get();
@@ -1150,14 +1160,14 @@ class bugModel extends model
$now = helper::now();
$oldBug = $this->getById($bugID);
$bug = fixer::input('post')
- ->add('assignedTo', 'closed')
- ->add('assignedDate', $now)
- ->add('status', 'closed')
- ->add('closedBy', $this->app->user->account)
- ->add('closedDate', $now)
- ->add('lastEditedBy', $this->app->user->account)
- ->add('lastEditedDate', $now)
- ->add('confirmed', 1)
+ ->add('assignedTo', 'closed')
+ ->add('status', 'closed')
+ ->add('confirmed', 1)
+ ->setDefault('assignedDate', $now)
+ ->setDefault('lastEditedBy', $this->app->user->account)
+ ->setDefault('lastEditedDate', $now)
+ ->setDefault('closedBy', $this->app->user->account)
+ ->setDefault('closedDate', $now)
->remove('comment')
->get();
@@ -1315,6 +1325,7 @@ class bugModel extends model
$bugs = $this->dao->select('*')->from(TABLE_BUG)
->where('deleted')->eq(0)
->beginIF(!$this->app->user->admin)->andWhere('project')->in('0,' . $this->app->user->view->projects)->fi()
+ ->beginIF($type != 'closedBy' and $this->app->moduleName == 'block')->andWhere('status')->ne('closed')->fi()
->beginIF($type != 'all')->andWhere("`$type`")->eq($account)->fi()
->orderBy($orderBy)
->beginIF($limit > 0)->limit($limit)->fi()
@@ -1957,8 +1968,8 @@ class bugModel extends model
public function saveUserBugTemplate()
{
$template = fixer::input('post')
- ->add('account', $this->app->user->account)
- ->add('type', 'bug')
+ ->setDefault('account', $this->app->user->account)
+ ->setDefault('type', 'bug')
->stripTags('content', $this->config->allowedTags)
->get();
@@ -2668,7 +2679,7 @@ class bugModel extends model
$assignToLink = helper::createLink('bug', 'assignTo', "bugID=$bug->id", '', true);
$assignToHtml = html::a($assignToLink, "{$assignedToText} ", '', "class='$btnClass'");
- echo !common::hasPriv('bug', 'assignTo') ? "{$assignedToText} " : $assignToHtml;
+ echo !common::hasPriv('bug', 'assignTo', $bug) ? "{$assignedToText} " : $assignToHtml;
}
/**
@@ -2690,7 +2701,7 @@ class bugModel extends model
$history = $this->action->getHistory($actionID);
$action->history = isset($history[$actionID]) ? $history[$actionID] : array();
$action->appendLink = '';
- if(strpos($action->extra, ':')!== false)
+ if(strpos($action->extra, ':') !== false)
{
list($extra, $id) = explode(':', $action->extra);
$action->extra = $extra;
diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php
index b50896bbd6..0e053826b3 100644
--- a/module/bug/view/batchcreate.html.php
+++ b/module/bug/view/batchcreate.html.php
@@ -96,7 +96,7 @@