Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Rename confirmBug to confirm.

Browse Source
This commit is contained in:
daitingting
2023-05-19 01:48:28 +00:00
parent 33f6a60a6d
commit 0839d28a8c
37 changed files with 100 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/api/v1/entries/bugconfirm.php
+2 -2
View File
@@ -23,8 +23,8 @@ class bugConfirmEntry extends entry
$fields = 'assignedTo,mailto,comment,pri,type';
$this->batchSetPost($fields);
$control = $this->loadController('bug', 'confirmBug');
$control->confirmBug($bugID);
$control = $this->loadController('bug', 'confirm');
$control->confirm($bugID);
$data = $this->getData();
if(!$data) return $this->send400('error');
module/bug/config.php
+8 -8
View File
@@ -53,14 +53,14 @@ $config->bug->custom->batchEditFields = 'type,severity,pri,assignedTo,deadline
$config->bug->excludeCheckFileds = ',severities,oses,browsers,lanes,regions,executions,projects,branches,';
$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,lastComment', 'tools' => 'bugTools');
$config->bug->editor->confirmbug = array('id' => 'comment', 'tools' => 'bugTools');
$config->bug->editor->assignto = array('id' => 'comment', 'tools' => 'bugTools');
$config->bug->editor->resolve = array('id' => 'comment', 'tools' => 'bugTools');
$config->bug->editor->close = array('id' => 'comment', 'tools' => 'bugTools');
$config->bug->editor->activate = array('id' => 'comment', 'tools' => 'bugTools');
$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,lastComment', 'tools' => 'bugTools');
$config->bug->editor->confirm = array('id' => 'comment', 'tools' => 'bugTools');
$config->bug->editor->assignto = array('id' => 'comment', 'tools' => 'bugTools');
$config->bug->editor->resolve = array('id' => 'comment', 'tools' => 'bugTools');
$config->bug->editor->close = array('id' => 'comment', 'tools' => 'bugTools');
$config->bug->editor->activate = array('id' => 'comment', 'tools' => 'bugTools');
$config->bug->discardedTypes = array('interface', 'designchange', 'newfeature', 'trackthings');
module/bug/control.php
+7 -7
View File
@@ -789,6 +789,7 @@ class bug extends control
}
/**
* 确认 bug。
* confirm a bug.
*
* @param int $bugID
@@ -796,13 +797,13 @@ class bug extends control
* @access public
* @return void
*/
public function confirmBug($bugID, $extra = '')
public function confirm(int $bugID, string $extra = '')
{
$bug = $this->bug->getById($bugID);
if(!empty($_POST))
{
$changes = $this->bug->confirm($bugID, $extra);
if(dao::isError()) return print(js::error(dao::getError()));
$actionID = $this->action->create('bug', $bugID, 'bugConfirmed', $this->post->comment);
$this->action->logHistory($actionID, $changes);
@@ -820,14 +821,13 @@ class bug extends control
return print(js::locate($this->createLink('bug', 'view', "bugID=$bugID"), 'parent'));
}
$productID = $bug->product;
$bug = $this->bug->getByID($bugID);
$this->bugZen->checkBugExecutionPriv($bug);
$this->qa->setMenu($this->products, $productID, $bug->branch);
$this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->bug->confirmBug;
$this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
$this->view->position[] = $this->lang->bug->confirmBug;
$this->qa->setMenu($this->products, $bug->product, $bug->branch);
$this->view->title = $this->products[$bug->product] . $this->lang->colon . $this->lang->bug->confirm;
$this->view->bug = $bug;
$this->view->users = $this->user->getPairs('noclosed', $bug->assignedTo);
$this->view->actions = $this->action->getList('bug', $bugID);
module/bug/js/common.js
+1 -1
View File
@@ -5,7 +5,7 @@ $(function()
$('#subNavbar a[data-toggle=dropdown]').parent().addClass('dropdown dropdown-hover');
if(page == 'create' || page == 'edit' || page == 'assignedto' || page == 'confirmbug')
if(page == 'create' || page == 'edit' || page == 'assignedto' || page == 'confirm')
{
oldProductID = $('#product').val();
}
module/bug/lang/de.php
+1 -1
View File
@@ -104,7 +104,7 @@ $lang->bug->noExecution = 'Haven’t chosen a ' . strtolower($lang->executi
$lang->bug->index = 'Home';
$lang->bug->create = 'Bug erstellen';
$lang->bug->batchCreate = 'Batch Report Bug';
$lang->bug->confirmBug = 'Bestätigen';
$lang->bug->confirm = 'Bestätigen';
$lang->bug->confirmAction = 'Confirm Bug';
$lang->bug->batchConfirm = 'Batch Confirm';
$lang->bug->edit = 'Bearbeiten';
module/bug/lang/en.php
+1 -1
View File
@@ -104,7 +104,7 @@ $lang->bug->noExecution = 'Haven’t chosen a ' . strtolower($lang->executi
$lang->bug->index = 'Bug Home';
$lang->bug->create = 'Report Bug';
$lang->bug->batchCreate = 'Batch Report';
$lang->bug->confirmBug = 'Confirm';
$lang->bug->confirm = 'Confirm';
$lang->bug->confirmAction = 'Confirm Bug';
$lang->bug->batchConfirm = 'Batch Confirm';
$lang->bug->edit = 'Edit Bug';
module/bug/lang/fr.php
+1 -1
View File
@@ -104,7 +104,7 @@ $lang->bug->noExecution = 'Haven’t chosen a ' . strtolower($lang->executi
$lang->bug->index = 'Accueil Bug';
$lang->bug->create = 'Signaler un Bug';
$lang->bug->batchCreate = 'Signaler par Lot';
$lang->bug->confirmBug = 'Confirmer';
$lang->bug->confirm = 'Confirmer';
$lang->bug->confirmAction = 'Confirmer Bug';
$lang->bug->batchConfirm = 'Confirmé par Lot';
$lang->bug->edit = 'Editer Bug';
module/bug/lang/vi.php
+1 -1
View File
@@ -85,7 +85,7 @@ $lang->bug->fixedRate = 'Repair Rate';
$lang->bug->index = 'Trang Bug';
$lang->bug->create = 'Báo cáo Bug';
$lang->bug->batchCreate = 'Batch báo cáo';
$lang->bug->confirmBug = 'Xác nhận';
$lang->bug->confirm = 'Xác nhận';
$lang->bug->confirmAction = 'Xác nhận Bug';
$lang->bug->batchConfirm = 'Xác nhận hàng loạt';
$lang->bug->edit = 'Sửa Bug';
module/bug/lang/zh-cn.php
+1 -1
View File
@@ -104,7 +104,7 @@ $lang->bug->noExecution = "还没有选择{$lang->execution->common}！";
$lang->bug->index = '首页';
$lang->bug->create = '提Bug';
$lang->bug->batchCreate = '批量提Bug';
$lang->bug->confirmBug = '确认';
$lang->bug->confirm = '确认';
$lang->bug->confirmAction = '确认Bug';
$lang->bug->batchConfirm = '批量确认';
$lang->bug->edit = '编辑Bug';
module/bug/lang/zh-tw.php
+1 -1
View File
@@ -94,7 +94,7 @@ $lang->bug->fixedRate = '修復率';
$lang->bug->index = '首頁';
$lang->bug->create = '提Bug';
$lang->bug->batchCreate = '批量提Bug';
$lang->bug->confirmBug = '確認';
$lang->bug->confirm = '確認';
$lang->bug->confirmAction = '確認Bug';
$lang->bug->batchConfirm = '批量確認';
$lang->bug->edit = '編輯Bug';
module/bug/model.php
+11 -11
View File
@@ -843,17 +843,17 @@ class bugModel extends model
->setDefault('lastEditedDate', $now)
->setDefault('assignedDate', $now)
->setDefault('mailto', '')
->stripTags($this->config->bug->editor->confirmbug['id'], $this->config->allowedTags)
->stripTags($this->config->bug->editor->confirm['id'], $this->config->allowedTags)
->remove('comment')
->join('mailto', ',')
->get();
$bug = $this->loadModel('file')->processImgURL($bug, $this->config->bug->editor->confirmbug['id'], $this->post->uid);
$bug = $this->loadModel('file')->processImgURL($bug, $this->config->bug->editor->confirm['id'], $this->post->uid);
$this->dao->update(TABLE_BUG)->data($bug)->autoCheck()->checkFlow()->where('id')->eq($bugID)->exec();
if(!dao::isError())
{
$this->loadModel('score')->create('bug', 'confirmBug', $oldBug);
$this->loadModel('score')->create('bug', 'confirm', $oldBug);
if($oldBug->execution)
{
$this->loadModel('kanban');
@@ -2511,11 +2511,11 @@ class bugModel extends model
{
$action = strtolower($action);
if($module == 'bug' && $action == 'confirmbug') return $object->status == 'active' and $object->confirmed == 0;
if($module == 'bug' && $action == 'resolve') return $object->status == 'active';
if($module == 'bug' && $action == 'close') return $object->status == 'resolved';
if($module == 'bug' && $action == 'activate') return $object->status != 'active';
if($module == 'bug' && $action == 'tostory') return $object->status == 'active';
if($module == 'bug' && $action == 'confirm') return $object->status == 'active' && $object->confirmed == 0;
if($module == 'bug' && $action == 'resolve') return $object->status == 'active';
if($module == 'bug' && $action == 'close') return $object->status == 'resolved';
if($module == 'bug' && $action == 'activate') return $object->status != 'active';
if($module == 'bug' && $action == 'tostory') return $object->status == 'active';
return true;
}
@@ -2990,8 +2990,8 @@ class bugModel extends model
$actions = array();
$actions['confirm']['icon'] = 'icon-ok';
$actions['confirm']['hint'] = $this->lang->bug->confirmBug;
$actions['confirm']['url'] = inlink('confirmBug', $params);
$actions['confirm']['hint'] = $this->lang->bug->confirm;
$actions['confirm']['url'] = inlink('confirm', $params);
$actions['confirm']['data-toggle'] = 'modal';
$actions['resolve']['icon'] = 'icon-checked';
@@ -3042,7 +3042,7 @@ class bugModel extends model
$convertParams = "productID=$bug->product&branch=$bug->branch&moduleID=0&from=bug&bugID=$bug->id";
$toStoryParams = "product=$bug->product&branch=$bug->branch&module=0&story=0&execution=0&bugID=$bug->id";
$menu .= $this->buildMenu('bug', 'confirmBug', $params, $bug, $type, 'ok', '', "iframe", true);
$menu .= $this->buildMenu('bug', 'confirm', $params, $bug, $type, 'ok', '', "iframe", true);
if($type == 'view' and $bug->status != 'closed') $menu .= $this->buildMenu('bug', 'assignTo', $params, $bug, $type, '', '', "iframe", true);
$menu .= $this->buildMenu('bug', 'resolve', $params, $bug, $type, 'checked', '', "iframe showinonlybody", true);
$menu .= $this->buildMenu('bug', 'close', $params, $bug, $type, '', '', "text-danger iframe showinonlybody", true);
module/bug/test/model/isclickable.php
+10 -10
View File
@@ -10,25 +10,25 @@ title=bugModel->isClickable();
cid=1
pid=1
状态为active confirmed为0的bug能否执行confirmbug动作 >> 1
状态为active confirmed为0的bug能否执行confirm动作 >> 1
状态为active confirmed为0的bug能否执行resolve动作 >> 1
状态为active confirmed为0的bug能否执行close动作 >> 2
状态为active confirmed为0的bug能否执行activate动作 >> 2
状态为active confirmed为0的bug能否执行tostory动作 >> 1
状态为active confirmed为0的bug能否执行test动作 >> 1
状态为active confirmed为1的bug能否执行confirmbug动作 >> 2
状态为active confirmed为1的bug能否执行confirm动作 >> 2
状态为active confirmed为1的bug能否执行resolve动作 >> 1
状态为active confirmed为1的bug能否执行close动作 >> 2
状态为active confirmed为1的bug能否执行activate动作 >> 2
状态为active confirmed为1的bug能否执行tostory动作 >> 1
状态为active confirmed为1的bug能否执行test动作 >> 1
状态为resolved的bug能否执行confirmbug动作 >> 2
状态为resolved的bug能否执行confirm动作 >> 2
状态为resolved的bug能否执行resolve动作 >> 2
状态为resolved的bug能否执行close动作 >> 1
状态为resolved的bug能否执行activate动作 >> 1
状态为resolved的bug能否执行tostory动作 >> 2
状态为resolved的bug能否执行test动作 >> 1
状态为closed的bug能否执行confirmbug动作 >> 2
状态为closed的bug能否执行confirm动作 >> 2
状态为closed的bug能否执行resolve动作 >> 2
状态为closed的bug能否执行close动作 >> 2
状态为closed的bug能否执行activate动作 >> 1
@@ -51,31 +51,31 @@ $object3->status = 'resolved';
$object4 = new stdclass();
$object4->status = 'closed';
$actionList = array('confirmbug', 'resolve', 'close', 'activate', 'tostory', 'test');
$actionList = array('confirm', 'resolve', 'close', 'activate', 'tostory', 'test');
$bug=new bugTest();
r($bug->isClickableTest($object1, $actionList[0])) && p() && e('1'); // 状态为active confirmed为0的bug能否执行confirmbug动作
r($bug->isClickableTest($object1, $actionList[0])) && p() && e('1'); // 状态为active confirmed为0的bug能否执行confirm动作
r($bug->isClickableTest($object1, $actionList[1])) && p() && e('1'); // 状态为active confirmed为0的bug能否执行resolve动作
r($bug->isClickableTest($object1, $actionList[2])) && p() && e('2'); // 状态为active confirmed为0的bug能否执行close动作
r($bug->isClickableTest($object1, $actionList[3])) && p() && e('2'); // 状态为active confirmed为0的bug能否执行activate动作
r($bug->isClickableTest($object1, $actionList[4])) && p() && e('1'); // 状态为active confirmed为0的bug能否执行tostory动作
r($bug->isClickableTest($object1, $actionList[5])) && p() && e('1'); // 状态为active confirmed为0的bug能否执行test动作
r($bug->isClickableTest($object2, $actionList[0])) && p() && e('2'); // 状态为active confirmed为1的bug能否执行confirmbug动作
r($bug->isClickableTest($object2, $actionList[0])) && p() && e('2'); // 状态为active confirmed为1的bug能否执行confirm动作
r($bug->isClickableTest($object2, $actionList[1])) && p() && e('1'); // 状态为active confirmed为1的bug能否执行resolve动作
r($bug->isClickableTest($object2, $actionList[2])) && p() && e('2'); // 状态为active confirmed为1的bug能否执行close动作
r($bug->isClickableTest($object2, $actionList[3])) && p() && e('2'); // 状态为active confirmed为1的bug能否执行activate动作
r($bug->isClickableTest($object2, $actionList[4])) && p() && e('1'); // 状态为active confirmed为1的bug能否执行tostory动作
r($bug->isClickableTest($object2, $actionList[5])) && p() && e('1'); // 状态为active confirmed为1的bug能否执行test动作
r($bug->isClickableTest($object3, $actionList[0])) && p() && e('2'); // 状态为resolved的bug能否执行confirmbug动作
r($bug->isClickableTest($object3, $actionList[0])) && p() && e('2'); // 状态为resolved的bug能否执行confirm动作
r($bug->isClickableTest($object3, $actionList[1])) && p() && e('2'); // 状态为resolved的bug能否执行resolve动作
r($bug->isClickableTest($object3, $actionList[2])) && p() && e('1'); // 状态为resolved的bug能否执行close动作
r($bug->isClickableTest($object3, $actionList[3])) && p() && e('1'); // 状态为resolved的bug能否执行activate动作
r($bug->isClickableTest($object3, $actionList[4])) && p() && e('2'); // 状态为resolved的bug能否执行tostory动作
r($bug->isClickableTest($object3, $actionList[5])) && p() && e('1'); // 状态为resolved的bug能否执行test动作
r($bug->isClickableTest($object4, $actionList[0])) && p() && e('2'); // 状态为closed的bug能否执行confirmbug动作
r($bug->isClickableTest($object4, $actionList[0])) && p() && e('2'); // 状态为closed的bug能否执行confirm动作
r($bug->isClickableTest($object4, $actionList[1])) && p() && e('2'); // 状态为closed的bug能否执行resolve动作
r($bug->isClickableTest($object4, $actionList[2])) && p() && e('2'); // 状态为closed的bug能否执行close动作
r($bug->isClickableTest($object4, $actionList[3])) && p() && e('1'); // 状态为closed的bug能否执行activate动作
r($bug->isClickableTest($object4, $actionList[4])) && p() && e('2'); // 状态为closed的bug能否执行tostory动作
r($bug->isClickableTest($object4, $actionList[5])) && p() && e('1'); // 状态为closed的bug能否执行test动作
r($bug->isClickableTest($object4, $actionList[5])) && p() && e('1'); // 状态为closed的bug能否执行test动作
module/bug/view/browse.html.php
+1 -1
View File
@@ -290,7 +290,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
$class = $canBatchConfirm ? '' : "class='disabled'";
$actionLink = $this->createLink('bug', 'batchConfirm');
$misc = $canBatchConfirm ? "onclick=\"setFormAction('$actionLink', 'hiddenwin', '#bugList')\"" : '';
echo "<li $class>" . html::a('javascript:;', $lang->bug->confirmBug, '', $misc) . "</li>";
echo "<li $class>" . html::a('javascript:;', $lang->bug->confirm, '', $misc) . "</li>";
$class = $canBatchClose ? '' : "class='disabled'";
$actionLink = $this->createLink('bug', 'batchClose');
module/bug/view/confirmbug.html.php → module/bug/view/confirm.html.php
+2 -2
View File
@@ -14,7 +14,7 @@
include '../../common/view/header.html.php';
include '../../common/view/kindeditor.html.php';
js::set('holders', $lang->bug->placeholder);
js::set('page', 'confirmbug');
js::set('page', 'confirm');
?>
<div id='mainContent' class='main-content'>
<div class='center-block'>
@@ -24,7 +24,7 @@ js::set('page', 'confirmbug');
<?php echo isonlybody() ? ('<span title="' . $bug->title . '">' . $bug->title . '</span>') : html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title);?>
<?php if(!isonlybody()):?>
<small><?php echo $lang->arrow . $lang->bug->confirmBug;?></small>
<small><?php echo $lang->arrow . $lang->bug->confirm;?></small>
<?php endif;?>
</h2>
</div>
module/common/lang/common.php
-1
View File
@@ -206,7 +206,6 @@ $lang->icons['close'] = 'off';
$lang->icons['activate'] = 'magic';
$lang->icons['review'] = 'glasses';
$lang->icons['confirm'] = 'search';
$lang->icons['confirmBug'] = 'search';
$lang->icons['putoff'] = 'calendar';
$lang->icons['suspend'] = 'pause';
$lang->icons['pause'] = 'pause';
module/common/lang/vi.php
+2 -3
View File
@@ -371,7 +371,7 @@ $lang->qa = new stdclass();
$lang->qa->menu = new stdclass();
$lang->qa->menu->index = array('link' => 'Index|qa|index');
$lang->qa->menu->bug = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,batchactivate,confirmbug,assignto');
$lang->qa->menu->bug = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,batchactivate,confirm,assignto');
$lang->qa->menu->testcase = array('link' => 'Tình huống|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib');
$lang->qa->menu->testtask = array('link' => 'Yêu cầu|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report,importunitresult');
$lang->qa->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase');
@@ -388,7 +388,7 @@ $lang->bug->menu = new stdclass();
$lang->bug->subMenu = $lang->qa->subMenu;
$lang->bug->menu->index = array('link' => 'Index|qa|index');
$lang->bug->menu->bug = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,batchactivate,confirmbug,assignto', 'subModule' => 'tree');
$lang->bug->menu->bug = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,batchactivate,confirm,assignto', 'subModule' => 'tree');
$lang->bug->menu->testcase = array('link' => 'Tình huống|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->bug->menu->testtask = array('link' => 'Yêu cầu|testtask|browse|productID=%s');
$lang->bug->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s');
@@ -835,7 +835,6 @@ $lang->icons['close'] = 'off';
$lang->icons['activate'] = 'magic';
$lang->icons['review'] = 'glasses';
$lang->icons['confirm'] = 'search';
$lang->icons['confirmBug'] = 'search';
$lang->icons['putoff'] = 'calendar';
$lang->icons['suspend'] = 'pause';
$lang->icons['pause'] = 'pause';
module/execution/js/kanban.js
+2 -2
View File
@@ -1072,7 +1072,7 @@ function changeCardColType(cardID, fromColID, toColID, fromLaneID, toLaneID, car
{
if(fromColType == 'unconfirmed' && priv.canConfirmBug)
{
var link = createLink('bug', 'confirmBug', 'bugID=' + objectID + '&extra=fromColID=' + fromColID + ',toColID=' + toColID + ',fromLaneID=' + fromLaneID + ',toLaneID=' + toLaneID + ',regionID=' + regionID, '', true);
var link = createLink('bug', 'confirm', 'bugID=' + objectID + '&extra=fromColID=' + fromColID + ',toColID=' + toColID + ',fromLaneID=' + fromLaneID + ',toLaneID=' + toLaneID + ',regionID=' + regionID, '', true);
showIframe = true;
}
}
@@ -1364,7 +1364,7 @@ function createBugMenu(options)
if(priv.canEditBug) items.push({label: bugLang.edit, icon: 'edit', url: createLink('bug', 'edit', 'bugID=' + bug.id + '&comment=&kanbanGroup=' + groupBy, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '95%'}});
if(priv.canResolveBug && (bug.$col.type == 'unconfirmed' || bug.$col.type == 'confirmed' || bug.$col.type == 'fixing')) items.push({label: bugLang.resolve, icon: 'checked', url: createLink('bug', 'resolve', 'bugID=' + bug.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
if(priv.canConfirmBug && (bug.$col.type == 'fixed' || bug.$col.type == 'testing' || bug.$col.type == 'tested')) items.push({label: bugLang.close, icon: 'off', url: createLink('bug', 'close', 'bugID=' + bug.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
if(priv.canConfirmBug && bug.$col.type == 'unconfirmed') items.push({label: bugLang.confirmBug, icon: 'ok', url: createLink('bug', 'confirmbug', 'bugID=' + bug.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
if(priv.canConfirmBug && bug.$col.type == 'unconfirmed') items.push({label: bugLang.confirm, icon: 'ok', url: createLink('bug', 'confirm', 'bugID=' + bug.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
if(priv.canCopyBug) items.push({label: bugLang.copy, icon: 'copy', url: createLink('bug', 'create', 'productID=' + productID + '&branch=&extras=bugID=' + bug.id + ',regionID=' + bug.$lane.region + ',laneID=' + bug.lane + ',columnID=' + bug.column + ',executionID=' + executionID, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
if(priv.canToStoryBug && (bug.$col.type != 'closed')) items.push({label: bugLang.toStory, icon: 'lightbulb', url: createLink('story', 'create', 'product=' + productID + '&branch=' + '0' + '&module=' + '0' + '&story=' + '0' + '&execution=' + '0' + '&bugID=' + bug.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
if(priv.canActivateBug && (bug.$col.type == 'fixed') || bug.$col.type == 'testing' || bug.$col.type == 'tested' || bug.$col.type == 'closed') items.push({label: bugLang.activate, icon: 'magic', url: createLink('bug', 'activate', 'bugID=' + bug.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
module/execution/js/taskkanban.js
+1 -1
View File
@@ -736,7 +736,7 @@ function changeCardColType(cardID, fromColID, toColID, fromLaneID, toLaneID, car
{
if(fromColType == 'unconfirmed' && priv.canConfirmBug)
{
var link = createLink('bug', 'confirmBug', 'bugID=' + objectID + '&extra=&from=taskkanban', '', true);
var link = createLink('bug', 'confirm', 'bugID=' + objectID + '&extra=&from=taskkanban', '', true);
showIframe = true;
}
}
module/execution/view/kanban.html.php
+1 -1
View File
@@ -96,7 +96,7 @@ js::set('priv',
'canLinkStoryByPlan' => $canLinkStoryByPlan,
'canViewBug' => common::hasPriv('bug', 'view'),
'canAssignBug' => common::hasPriv('bug', 'assignto'),
'canConfirmBug' => common::hasPriv('bug', 'confirmBug'),
'canConfirmBug' => common::hasPriv('bug', 'confirm'),
'canResolveBug' => common::hasPriv('bug', 'resolve'),
'canCopyBug' => common::hasPriv('bug', 'create'),
'canEditBug' => common::hasPriv('bug', 'edit'),
module/execution/view/taskkanban.html.php
+1 -1
View File
@@ -208,7 +208,7 @@ js::set('priv',
'canActivateTask' => common::hasPriv('task', 'activate'),
'canStartTask' => common::hasPriv('task', 'start'),
'canAssignBug' => common::hasPriv('bug', 'assignto'),
'canConfirmBug' => common::hasPriv('bug', 'confirmBug'),
'canConfirmBug' => common::hasPriv('bug', 'confirm'),
'canActivateBug' => common::hasPriv('bug', 'activate'),
'canCloseStory' => common::hasPriv('story', 'close')
)
module/group/lang/allresources.php
+3 -3
View File
File diff suppressed because one or more lines are too long
module/group/lang/resource.php
+2 -2
View File
@@ -979,7 +979,7 @@ $lang->resource->bug = new stdclass();
$lang->resource->bug->browse = 'browse';
$lang->resource->bug->create = 'create';
$lang->resource->bug->batchCreate = 'batchCreate';
$lang->resource->bug->confirmBug = 'confirmAction';
$lang->resource->bug->confirm = 'confirm';
$lang->resource->bug->batchConfirm = 'batchConfirm';
$lang->resource->bug->view = 'view';
$lang->resource->bug->edit = 'edit';
@@ -1006,7 +1006,7 @@ $lang->bug->methodOrder[5] = 'browse';
$lang->bug->methodOrder[10] = 'create';
$lang->bug->methodOrder[15] = 'batchCreate';
$lang->bug->methodOrder[20] = 'batchEdit';
$lang->bug->methodOrder[25] = 'confirmBug';
$lang->bug->methodOrder[25] = 'confirm';
$lang->bug->methodOrder[30] = 'batchConfirm';
$lang->bug->methodOrder[35] = 'view';
$lang->bug->methodOrder[40] = 'edit';
module/kanban/model.php
+8 -8
View File
@@ -3895,14 +3895,14 @@ class kanbanModel extends model
{
$menu = array();
if(common::hasPriv('bug', 'edit') and $this->bug->isClickable($bug, 'edit')) $menu[] = array('label' => $this->lang->bug->edit, 'icon' => 'edit', 'url' => helper::createLink('bug', 'edit', "bugID=$bug->id", '', true), 'size' => '95%');
if(common::hasPriv('bug', 'confirmBug') and $this->bug->isClickable($bug, 'confirmBug')) $menu[] = array('label' => $this->lang->bug->confirmBug, 'icon' => 'ok', 'url' => helper::createLink('bug', 'confirmBug', "bugID=$bug->id&extra=&from=taskkanban", '', true));
if(common::hasPriv('bug', 'resolve') and $this->bug->isClickable($bug, 'resolve')) $menu[] = array('label' => $this->lang->bug->resolve, 'icon' => 'checked', 'url' => helper::createLink('bug', 'resolve', "bugID=$bug->id&extra=&from=taskkanban", '', true));
if(common::hasPriv('bug', 'close') and $this->bug->isClickable($bug, 'close')) $menu[] = array('label' => $this->lang->bug->close, 'icon' => 'off', 'url' => helper::createLink('bug', 'close', "bugID=$bug->id&extra=&from=taskkanban", '', true));
if(common::hasPriv('bug', 'create') and $this->bug->isClickable($bug, 'create')) $menu[] = array('label' => $this->lang->bug->copy, 'icon' => 'copy', 'url' => helper::createLink('bug', 'create', "productID=$bug->product&branch=$bug->branch&extras=bugID=$bug->id", '', true), 'size' => '95%');
if(common::hasPriv('bug', 'activate') and $this->bug->isClickable($bug, 'activate')) $menu[] = array('label' => $this->lang->bug->activate, 'icon' => 'magic', 'url' => helper::createLink('bug', 'activate', "bugID=$bug->id&extra=&from=taskkanban", '', true));
if(common::hasPriv('story', 'create') and $bug->status != 'closed') $menu[] = array('label' => $this->lang->bug->toStory, 'icon' => 'lightbulb', 'url' => helper::createLink('story', 'create', "product=$bug->product&branch=$bug->branch&module=0&story=0&execution=0&bugID=$bug->id", '', true), 'size' => '95%');
if(common::hasPriv('bug', 'delete')) $menu[] = array('label' => $this->lang->bug->delete, 'icon' => 'trash', 'url' => helper::createLink('bug', 'delete', "bugID=$bug->id&confirm=no&from=taskkanban"));
if(common::hasPriv('bug', 'edit') && $this->bug->isClickable($bug, 'edit')) $menu[] = array('label' => $this->lang->bug->edit, 'icon' => 'edit', 'url' => helper::createLink('bug', 'edit', "bugID=$bug->id", '', true), 'size' => '95%');
if(common::hasPriv('bug', 'confirm') && $this->bug->isClickable($bug, 'confirm')) $menu[] = array('label' => $this->lang->bug->confirm, 'icon' => 'ok', 'url' => helper::createLink('bug', 'confirm', "bugID=$bug->id&extra=&from=taskkanban", '', true));
if(common::hasPriv('bug', 'resolve') && $this->bug->isClickable($bug, 'resolve')) $menu[] = array('label' => $this->lang->bug->resolve, 'icon' => 'checked', 'url' => helper::createLink('bug', 'resolve', "bugID=$bug->id&extra=&from=taskkanban", '', true));
if(common::hasPriv('bug', 'close') && $this->bug->isClickable($bug, 'close')) $menu[] = array('label' => $this->lang->bug->close, 'icon' => 'off', 'url' => helper::createLink('bug', 'close', "bugID=$bug->id&extra=&from=taskkanban", '', true));
if(common::hasPriv('bug', 'create') && $this->bug->isClickable($bug, 'create')) $menu[] = array('label' => $this->lang->bug->copy, 'icon' => 'copy', 'url' => helper::createLink('bug', 'create', "productID=$bug->product&branch=$bug->branch&extras=bugID=$bug->id", '', true), 'size' => '95%');
if(common::hasPriv('bug', 'activate') && $this->bug->isClickable($bug, 'activate')) $menu[] = array('label' => $this->lang->bug->activate, 'icon' => 'magic', 'url' => helper::createLink('bug', 'activate', "bugID=$bug->id&extra=&from=taskkanban", '', true));
if(common::hasPriv('story', 'create') && $bug->status != 'closed') $menu[] = array('label' => $this->lang->bug->toStory, 'icon' => 'lightbulb', 'url' => helper::createLink('story', 'create', "product=$bug->product&branch=$bug->branch&module=0&story=0&execution=0&bugID=$bug->id", '', true), 'size' => '95%');
if(common::hasPriv('bug', 'delete')) $menu[] = array('label' => $this->lang->bug->delete, 'icon' => 'trash', 'url' => helper::createLink('bug', 'delete', "bugID=$bug->id&confirm=no&from=taskkanban"));
$menus[$bug->id] = $menu;
}
module/my/view/bug.html.php
+6 -6
View File
@@ -148,11 +148,11 @@
if($canBeChanged)
{
$params = "bugID=$bug->id";
common::printIcon('bug', 'confirmBug', $params, $bug, 'list', 'ok', '', 'iframe', true, '', '', $bug->project);
common::printIcon('bug', 'resolve', $params, $bug, 'list', 'checked', '', 'iframe', true, '', '', $bug->project);
common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true, '', '', $bug->project);
common::printIcon('bug', 'edit', $params, $bug, 'list', '', '', 'iframe', true, "data-width='95%'", '', $bug->project);
common::printIcon('bug', 'create', "product=$bug->product&branch=$bug->branch&extra=$params", $bug, 'list', 'copy', '', 'iframe', true, "data-width='95%'", '', $bug->project);
common::printIcon('bug', 'confirm', $params, $bug, 'list', 'ok', '', 'iframe', true, '', '', $bug->project);
common::printIcon('bug', 'resolve', $params, $bug, 'list', 'checked', '', 'iframe', true, '', '', $bug->project);
common::printIcon('bug', 'close', $params, $bug, 'list', '', '', 'iframe', true, '', '', $bug->project);
common::printIcon('bug', 'edit', $params, $bug, 'list', '', '', 'iframe', true, "data-width='95%'", '', $bug->project);
common::printIcon('bug', 'create', "product=$bug->product&branch=$bug->branch&extra=$params", $bug, 'list', 'copy', '', 'iframe', true, "data-width='95%'", '', $bug->project);
}
?>
</td>
@@ -176,7 +176,7 @@
{
$actionLink = $this->createLink('bug', 'batchConfirm', '', '', '', $bug->project);
$misc = "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"";
echo html::commonButton($lang->bug->confirmBug, $misc);
echo html::commonButton($lang->bug->confirm, $misc);
}
if($canBatchClose)
{
module/project/config.php
+2 -2
View File
@@ -239,7 +239,7 @@ $config->project->search['params']['closedDate'] = array('operator' => '='
$config->project->noSprintPriv['project'] = array('edit', 'group', 'createGroup', 'managePriv', 'manageMembers', 'manageGroupMember', 'copyGroup', 'editGroup', 'start', 'suspend', 'close', 'activate', 'delete', 'view', 'whitelist', 'addWhitelist', 'unbindWhitelist', 'manageProducts', 'dynamic', 'bug', 'testcase', 'testtask', 'testreport', 'team', 'unlinkMember');
$config->project->noSprintPriv['execution'] = array('task', 'grouptask', 'importplanstories', 'importBug', 'story', 'burn', 'computeBurn', 'fixFirst', 'burnData', 'linkStory', 'unlinkStory', 'batchUnlinkStory', 'updateOrder', 'taskKanban', 'printKanban', 'tree', 'treeTask', 'treeStory', 'storyKanban', 'storySort', 'storyEstimate', 'setKanban', 'storyView', 'calendar', 'effortCalendar', 'effort', 'taskEffort', 'computeTaskEffort', 'deleterelation', 'maintainrelation', 'relation', 'gantt', 'ganttsetting', 'ganttEdit');
$config->project->noSprintPriv['story'] = array('create', 'batchCreate', 'edit', 'export', 'delete', 'view', 'change', 'review', 'batchReview', 'recall', 'close', 'batchClose', 'batchChangePlan', 'batchChangeStage', 'assignTo', 'batchAssignTo', 'activate', 'zeroCase', 'batchEdit', 'import', 'showImport', 'exportTemplate', 'importToLib', 'batchImportToLib', 'relation', 'browse');
$config->project->noSprintPriv['bug'] = array('create', 'confirmBug', 'view', 'edit', 'assignTo', 'batchAssignTo', 'resolve', 'activate', 'close', 'export', 'confirmStoryChange', 'delete', 'linkBugs', 'import', 'showImport', 'exportTemplate');
$config->project->noSprintPriv['bug'] = array('create', 'confirm', 'view', 'edit', 'assignTo', 'batchAssignTo', 'resolve', 'activate', 'close', 'export', 'confirmStoryChange', 'delete', 'linkBugs', 'import', 'showImport', 'exportTemplate');
$config->project->noSprintPriv['testcase'] = array('groupCase', 'create', 'batchCreate', 'createBug', 'view', 'edit', 'delete', 'export', 'confirmChange', 'confirmStoryChange', 'batchEdit', 'batchDelete', 'linkCases', 'bugs', 'review', 'batchReview', 'batchConfirmStoryChange', 'importFromLib', 'batchCaseTypeChange', 'exportTemplate', 'import', 'showImport', 'confirmLibcaseChange', 'ignoreLibcaseChange', 'submit');
$config->project->noSprintPriv['testtask'] = array('create', 'cases', 'groupCase', 'edit', 'delete', 'batchAssign', 'linkcase', 'unlinkcase', 'runcase', 'results', 'batchUnlinkCases', 'report', 'browseUnits', 'unitCases', 'importUnitResult', 'batchRun', 'runDeployCase', 'deployCaseResults');
$config->project->includedPriv['doc'] = array('createLib', 'editLib', 'deleteLib', 'create', 'edit', 'view', 'delete', 'deleteFile', 'collect', 'projectSpace', 'showFiles', 'addCatalog', 'editCatalog', 'deleteCatalog', 'displaySetting', 'diff', 'importToPracticeLib', 'importToComponentLib');
@@ -251,7 +251,7 @@ $config->project->includedPriv = $config->project->noSprintPriv;
$config->project->includedPriv['project'][] = 'execution';
$config->project->includedPriv['task'] = array('create');
$config->project->includedPriv['story'] = array('create', 'batchCreate', 'edit', 'export', 'delete', 'view', 'change', 'review', 'batchReview', 'recall', 'close', 'batchClose', 'batchChangePlan', 'batchChangeStage', 'assignTo', 'batchAssignTo', 'activate', 'zeroCase', 'batchEdit', 'import', 'showImport', 'exportTemplate', 'importToLib', 'batchImportToLib', 'relation', 'browse');
$config->project->includedPriv['bug'] = array('create', 'confirmBug', 'view', 'edit', 'assignTo', 'batchAssignTo', 'resolve', 'activate', 'close', 'export', 'confirmStoryChange', 'delete', 'linkBugs', 'import', 'showImport', 'exportTemplate');
$config->project->includedPriv['bug'] = array('create', 'confirm', 'view', 'edit', 'assignTo', 'batchAssignTo', 'resolve', 'activate', 'close', 'export', 'confirmStoryChange', 'delete', 'linkBugs', 'import', 'showImport', 'exportTemplate');
$config->project->includedPriv['testcase'] = array('groupCase', 'create', 'batchCreate', 'createBug', 'view', 'edit', 'delete', 'export', 'confirmChange', 'confirmStoryChange', 'batchEdit', 'batchDelete', 'linkCases', 'bugs', 'review', 'batchReview', 'batchConfirmStoryChange', 'importFromLib', 'batchCaseTypeChange', 'exportTemplate', 'import', 'showImport', 'confirmLibcaseChange', 'ignoreLibcaseChange', 'submit');
$config->project->includedPriv['testtask'] = array('create', 'cases', 'groupCase', 'edit', 'delete', 'batchAssign', 'linkcase', 'unlinkcase', 'runcase', 'results', 'batchUnlinkCases', 'report', 'browseUnits', 'unitCases', 'importUnitResult', 'batchRun', 'runDeployCase', 'deployCaseResults');
$config->project->includedPriv['doc'] = array('createLib', 'editLib', 'deleteLib', 'create', 'edit', 'view', 'delete', 'deleteFile', 'collect', 'projectSpace', 'showFiles', 'addCatalog', 'editCatalog', 'deleteCatalog', 'displaySetting', 'diff', 'importToPracticeLib', 'importToComponentLib');
module/score/config.php
+2 -2
View File
@@ -40,7 +40,7 @@ $config->score->rule->doc->create = array('times' => 0, 'hour' => 0, 'score' =>
$config->score->rule->bug->create = array('times' => 0, 'hour' => 0, 'score' => 1);
$config->score->rule->bug->resolve = array('times' => 0, 'hour' => 0, 'score' => 1);
$config->score->rule->bug->confirmBug = array('times' => 0, 'hour' => 0, 'score' => 1);
$config->score->rule->bug->confirm = array('times' => 0, 'hour' => 0, 'score' => 1);
$config->score->rule->bug->saveTplModal = array('times' => 1, 'hour' => 0, 'score' => 20);
$config->score->rule->bug->createFormCase = array('times' => 0, 'hour' => 0, 'score' => 1);
@@ -76,7 +76,7 @@ $config->score->rule->search->saveQueryAdvanced = array('times' => 1, 'hour' =>
$config->score->ruleExtended = array();
$config->score->ruleExtended['story']['close'] = array('createID' => 2);
$config->score->ruleExtended['user']['changePassword'] = array('strength' => array(1 => 2, 2 => 5));
$config->score->ruleExtended['bug']['confirmBug'] = array('severity' => array(1 => 3, 2 => 2, 3 => 1));
$config->score->ruleExtended['bug']['confirm'] = array('severity' => array(1 => 3, 2 => 2, 3 => 1));
$config->score->ruleExtended['bug']['resolve'] = array('severity' => array(1 => 3, 2 => 2, 3 => 1));
$config->score->ruleExtended['task']['finish'] = array('pri' => array(1 => 2, 2 => 1, 3 => 0));
$config->score->ruleExtended['execution']['close'] = array('manager' => array('close' => 20, 'onTime' => 10),
module/score/lang/de.php
+2 -2
View File
@@ -65,7 +65,7 @@ $lang->score->methods['todo']['create'] = 'Todo erstellen';
$lang->score->methods['story']['create'] = 'Story erstellen';
$lang->score->methods['story']['close'] = 'Story schließen';
$lang->score->methods['bug']['create'] = 'Bug erstellen';
$lang->score->methods['bug']['confirmBug'] = 'Bug bestätigen';
$lang->score->methods['bug']['confirm'] = 'Bug bestätigen';
$lang->score->methods['bug']['createFormCase'] = 'Bug aus Fall erzeugen';
$lang->score->methods['bug']['resolve'] = 'Bug lösen';
$lang->score->methods['bug']['saveTplModal'] = 'Bug Vorlage erstellen';
@@ -83,6 +83,6 @@ $lang->score->methods['search']['saveQueryAdvanced'] = 'Erweitere Suche';
$lang->score->extended['user']['changePassword'] = 'Get ##strength,1## point, if password is medium. Get ##strength,2## points, if it is strong.';
$lang->score->extended['execution']['close'] = 'Nachdem das Projekt geschlossen wurde, bekommt der Projektmanager ##manager,close## Punkte und Teammitglieder ##member,close## Punkte. Wenn es vorzeitig erledigt ist, bekommt der Projektmanager ##manager,onTime## Punkte und Teammitglieder ##member,onTime## Punkte.';
$lang->score->extended['bug']['resolve'] = 'Nach dem Lösen eines Bugs, werden die Punkte nach der Dringlichkeit vergeben. S1, + ##severity,3##; S2 + ##severity,2##, S3 + ##severity,1##.';
$lang->score->extended['bug']['confirmBug'] = 'Wenn ein Bug bestätigt wurde, werden die Punkte nach der Dringlichkeit vergeben. S1, + ##severity,3##; S2 + ##severity,2##, S3 + ##severity,1##.';
$lang->score->extended['bug']['confirm'] = 'Wenn ein Bug bestätigt wurde, werden die Punkte nach der Dringlichkeit vergeben. S1, + ##severity,3##; S2 + ##severity,2##, S3 + ##severity,1##.';
$lang->score->extended['task']['finish'] = 'Wenn eine Aufgabe erledigt wurde, werden folgende Punkte vergeben: runde(Mannstunden / 10 Schätzung / Verbraucht) + Prirität (p1 ##pri,1##, p2 ##pri,2##).';
$lang->score->extended['story']['close'] = 'Wenn eine Story geschlossen wurde, bekommt der Ersteler ##createID## Punkte.';
module/score/lang/en.php
+2 -2
View File
@@ -65,7 +65,7 @@ $lang->score->methods['todo']['create'] = 'Create Todo';
$lang->score->methods['story']['create'] = 'Create Story';
$lang->score->methods['story']['close'] = 'Close Story';
$lang->score->methods['bug']['create'] = 'Report Bug';
$lang->score->methods['bug']['confirmBug'] = 'Confirm Bug';
$lang->score->methods['bug']['confirm'] = 'Confirm Bug';
$lang->score->methods['bug']['createFormCase'] = 'Report Bug form Case';
$lang->score->methods['bug']['resolve'] = 'Resolve Bug';
$lang->score->methods['bug']['saveTplModal'] = 'Save Template';
@@ -83,6 +83,6 @@ $lang->score->methods['search']['saveQueryAdvanced'] = 'Advanced Search';
$lang->score->extended['user']['changePassword'] = 'Get ##strength,1## point, if the password strength is medium. Get ##strength,2## points, if it is strong.';
$lang->score->extended['execution']['close'] = "After the execution is close, project manager gets ##manager,close## point and team members get ##member,close## points. If it is done on time or earlier, the project manager gets ##manager,onTime## point and team members get ##member,onTime## points.";
$lang->score->extended['bug']['resolve'] = 'After a bug is resolved, get extra points according to its severity. S1, + ##severity,1##; S2 + ##severity,2##, S3 + ##severity,3##.';
$lang->score->extended['bug']['confirmBug'] = 'After a bug is confirmed, get extra points according to its severity. S1, + ##severity,1##; S2 + ##severity,2##, S3 + ##severity,3##.';
$lang->score->extended['bug']['confirm'] = 'After a bug is confirmed, get extra points according to its severity. S1, + ##severity,1##; S2 + ##severity,2##, S3 + ##severity,3##.';
$lang->score->extended['task']['finish'] = 'After a task is done, get extra points by round(man-hour / 10 Estimates / Cost) + Priority point (p1 ##pri,1##, p2 ##pri,2##).';
$lang->score->extended['story']['close'] = 'After a story is closed, its creator will get extra ##createID## points.';
module/score/lang/vi.php
+2 -2
View File
@@ -65,7 +65,7 @@ $lang->score->methods['todo']['create'] = 'Tạo việc làm';
$lang->score->methods['story']['create'] = 'Tạo câu chuyện';
$lang->score->methods['story']['close'] = 'Đóng câu chuyện';
$lang->score->methods['bug']['create'] = 'Báo cáo Bug';
$lang->score->methods['bug']['confirmBug'] = 'Xác nhận Bug';
$lang->score->methods['bug']['confirm'] = 'Xác nhận Bug';
$lang->score->methods['bug']['createFormCase'] = 'Báo cáo Bug từ tình huống';
$lang->score->methods['bug']['resolve'] = 'Giải quyết Bug';
$lang->score->methods['bug']['saveTplModal'] = 'Lưu mẫu';
@@ -83,6 +83,6 @@ $lang->score->methods['search']['saveQueryAdvanced'] = 'Tìm kiếm nâng cao';
$lang->score->extended['user']['changePassword'] = 'Nhận ##strength,1## điểm, nếu độ mạnh mật khẩu trung bình. Nhận ##strength,2## điểm, nếu mật khẩu mạnh.';
$lang->score->extended['execution']['close'] = 'Sau khi dự án đóng, quản lý dự án nhận điểm ##manager,close## và thành viên đội nhóm nhận điểm ##member,close## . Nếu nó được hoàn thành đúng giờ hoặc sớm hơn, quản lý dự án này nhận điểm ##manager,onTime## và thành viên đội nhóm nhận điểm ##member,onTime##.';
$lang->score->extended['bug']['resolve'] = 'Sau khi một bug được giải quyết, nhận thêm điểm theo mức độ nghiêm trọng của nó. S1, + ##severity,1##; S2 + ##severity,2##, S3 + ##severity,3##.';
$lang->score->extended['bug']['confirmBug'] = 'Sau khi một bug được xác nhận, nhận thêm điểm theo mức độ nghiêm trọng của nó. S1, + ##severity,1##; S2 + ##severity,2##, S3 + ##severity,3##.';
$lang->score->extended['bug']['confirm'] = 'Sau khi một bug được xác nhận, nhận thêm điểm theo mức độ nghiêm trọng của nó. S1, + ##severity,1##; S2 + ##severity,2##, S3 + ##severity,3##.';
$lang->score->extended['task']['finish'] = 'Sau khi một nhiệm vụ được hoàn thành, nhận điểm mở rộng theo vòng (giờ công / 10 Dự tính / đã làm) + điểm ưu tiên (p1 ##pri,1##, p2 ##pri,2##).';
$lang->score->extended['story']['close'] = 'Sau khi một câu chuyện được đóng, người tạo sẽ nhận thêm ##createID## points.';
module/score/lang/zh-cn.php
+2 -2
View File
@@ -65,7 +65,7 @@ $lang->score->methods['todo']['create'] = '创建待办';
$lang->score->methods['story']['create'] = "创建{$lang->SRCommon}";
$lang->score->methods['story']['close'] = "{$lang->SRCommon}关闭";
$lang->score->methods['bug']['create'] = '创建Bug';
$lang->score->methods['bug']['confirmBug'] = '确认Bug';
$lang->score->methods['bug']['confirm'] = '确认Bug';
$lang->score->methods['bug']['createFormCase'] = '从用例创建';
$lang->score->methods['bug']['resolve'] = '解决Bug';
$lang->score->methods['bug']['saveTplModal'] = '保存模板';
@@ -83,6 +83,6 @@ $lang->score->methods['search']['saveQueryAdvanced'] = '使用高级搜索';
$lang->score->extended['user']['changePassword'] = '密码强度为中，额外获得##strength,1##个积分；为强，额外获得##strength,2##个积分。';
$lang->score->extended['execution']['close'] = "项目经理增加##manager,close##个积分，{$lang->executionCommon}成员增加##member,close##个积分。按期或者提前完成，项目经理额外增加##manager,onTime##个积分，{$lang->executionCommon}成员额外增加##member,onTime##个积分。";
$lang->score->extended['bug']['resolve'] = 'Bug解决后，额外增加严重程度积分：s1 + ##severity,1##, s2 + ##severity,2##, s3 + ##severity,3##。';
$lang->score->extended['bug']['confirmBug'] = 'Bug确认后，额外增加严重程度积分：s1 + ##severity,1##, s2 + ##severity,2##, s3 + ##severity,3##。';
$lang->score->extended['bug']['confirm'] = 'Bug确认后，额外增加严重程度积分：s1 + ##severity,1##, s2 + ##severity,2##, s3 + ##severity,3##。';
$lang->score->extended['task']['finish'] = '额外增加工时积分 round(工时 / 10 * 预计 / 消耗) + 优先级积分(p1 ##pri,1##, p2 ##pri,2##)。';
$lang->score->extended['story']['close'] = "{$lang->SRCommon}的创建者额外增加##createID##分";
module/score/lang/zh-tw.php
+2 -2
View File
@@ -65,7 +65,7 @@ $lang->score->methods['todo']['create'] = '創建待辦';
$lang->score->methods['story']['create'] = "創建{$lang->SRCommon}";
$lang->score->methods['story']['close'] = "{$lang->SRCommon}關閉";
$lang->score->methods['bug']['create'] = '創建Bug';
$lang->score->methods['bug']['confirmBug'] = '確認Bug';
$lang->score->methods['bug']['confirm'] = '確認Bug';
$lang->score->methods['bug']['createFormCase'] = '從用例創建';
$lang->score->methods['bug']['resolve'] = '解決Bug';
$lang->score->methods['bug']['saveTplModal'] = '保存模板';
@@ -83,6 +83,6 @@ $lang->score->methods['search']['saveQueryAdvanced'] = '使用高級搜索';
$lang->score->extended['user']['changePassword'] = '密碼強度為中，額外獲得##strength,1##個積分；為強，額外獲得##strength,2##個積分。';
$lang->score->extended['execution']['close'] = "項目經理增加##manager,close##個積分，{$lang->executionCommon}成員增加##member,close##個積分。按期或者提前完成，項目經理額外增加##manager,onTime##個積分，{$lang->executionCommon}成員額外增加##member,onTime##個積分。";
$lang->score->extended['bug']['resolve'] = 'Bug解決後，額外增加嚴重程度積分：s1 + ##severity,1##, s2 + ##severity,2##, s3 + ##severity,3##。';
$lang->score->extended['bug']['confirmBug'] = 'Bug確認後，額外增加嚴重程度積分：s1 + ##severity,1##, s2 + ##severity,2##, s3 + ##severity,3##。';
$lang->score->extended['bug']['confirm'] = 'Bug確認後，額外增加嚴重程度積分：s1 + ##severity,1##, s2 + ##severity,2##, s3 + ##severity,3##。';
$lang->score->extended['task']['finish'] = '額外增加工時積分 round(工時 / 10 * 預計 / 消耗) + 優先順序積分(p1 ##pri,1##, p2 ##pri,2##)。';
$lang->score->extended['story']['close'] = "{$lang->SRCommon}的創建者額外增加##createID##分";
module/score/model.php
+2 -2
View File
@@ -110,7 +110,7 @@ class scoreModel extends model
if($method == 'saveTplModal') $desc = $this->lang->score->methods[$module][$method] . 'ID:' . $param;
if($method == 'confirmBug')
if($method == 'confirm')
{
$user = $param->openedBy;
$desc .= 'ID:' . $param->id;
@@ -282,7 +282,7 @@ class scoreModel extends model
*/
public function fixKey($string)
{
$strings = array('created' => 'create', 'opened' => 'create', 'closed' => 'close', 'finished' => 'finish', 'bugconfirmed' => 'confirmBug', 'resolved' => 'resolve');
$strings = array('created' => 'create', 'opened' => 'create', 'closed' => 'close', 'finished' => 'finish', 'bugconfirmed' => 'confirm', 'resolved' => 'resolve');
return isset($strings[$string]) ? $strings[$string] : $string;
}
module/score/test/model/create.php
+2 -2
View File
@@ -21,7 +21,7 @@ product模块的edit方法不存在与积分规则中，不计算积分 >> 0
*/
$moduleList = array('user', 'story', 'task', 'bug', 'execution', 'product');
$methodList = array('login', 'close', 'finish', 'confirmBug', 'close', 'edit');
$methodList = array('login', 'close', 'finish', 'confirm', 'close', 'edit');
$accountList = array('admin', 'dev10', 'test10', 'top10');
$bug = new stdclass();
@@ -42,4 +42,4 @@ r($score->createTest($moduleList[2], $methodList[2], '601'))
r($score->createTest($moduleList[2], $methodList[2], '2')) && p('score') && e('2'); // ID为2 的任务,优先级为2，消耗4h, 预计1h
r($score->createTest($moduleList[3], $methodList[3], $bug)) && p('score') && e('4'); // 确认严重程度为1的bug
r($score->createTest($moduleList[4], $methodList[4], $execution, 'admin', '2022-05-11')) && p('score') && e('30'); // 在截止时间内关闭一个项目经理为admin的执行
r($score->createTest($moduleList[5], $methodList[5])) && p('') && e('0'); // product模块的edit方法不存在与积分规则中，不计算积分
r($score->createTest($moduleList[5], $methodList[5])) && p('') && e('0'); // product模块的edit方法不存在与积分规则中，不计算积分
module/score/test/model/fixkey.php
+3 -3
View File
@@ -12,7 +12,7 @@ pid=1
action为created >> create
action为opened >> create
action为bugconfirmed >> confirmBug
action为bugconfirmed >> confirm
action为fixed, 不存在于strings中 >> fixed
*/
@@ -23,5 +23,5 @@ $score = new scoreTest();
r($score->fixKeyTest($actionList[0])) && p('') && e('create'); // action为created
r($score->fixKeyTest($actionList[1])) && p('') && e('create'); // action为opened
r($score->fixKeyTest($actionList[2])) && p('') && e('confirmBug'); // action为bugconfirmed
r($score->fixKeyTest($actionList[3])) && p('') && e('fixed'); // action为fixed, 不存在于strings中
r($score->fixKeyTest($actionList[2])) && p('') && e('confirm'); // action为bugconfirmed
r($score->fixKeyTest($actionList[3])) && p('') && e('fixed'); // action为fixed, 不存在于strings中
module/search/view/buildform.html.php
+1 -1
View File
@@ -250,7 +250,7 @@ foreach($fieldParams as $fieldName => $param)
echo html::submitButton($lang->search->common, '', 'btn btn-primary') . " &nbsp; ";
if($style != 'simple') echo html::commonButton($lang->search->reset, '', 'btn-reset-form btn');
echo html::commonButton('<i class="icon icon-chevron-double-down"></i>', '', 'btn-expand-form btn btn-info pull-right');
if($style != 'simple' and common::hasPriv('search', 'saveQuery')) echo html::a($this->createLink('search', 'saveQuery', "module=$module&onMenuBar=$onMenuBar"), '<span class="text"><i class="icon-bug-confirmBug icon-save"></i> ' . $lang->search->saveCondition . '</span>', '', "class='btn-save-form btn btn-link btn-active-text text iframe' id='save-query'");
if($style != 'simple' and common::hasPriv('search', 'saveQuery')) echo html::a($this->createLink('search', 'saveQuery', "module=$module&onMenuBar=$onMenuBar"), '<span class="text"><i class="icon-bug-confirm icon-save"></i> ' . $lang->search->saveCondition . '</span>', '', "class='btn-save-form btn btn-link btn-active-text text iframe' id='save-query'");
echo html::hidden('formType', zget($formSession, 'formType', 'lite'));
?>
</td>
module/task/zen.php
+2 -2
View File
@@ -120,7 +120,7 @@ class taskZen extends task
{
if($change['field'] == 'status')
{
$response['callback'] = "parent.confirmBug('" . sprintf($this->lang->task->remindBug, $task->fromBug) . "', {$task->fromBug})";
$response['callback'] = "parent.confirmBug('" . sprintf($this->lang->task->remindBug, $task->fromBug) . "', {$task->fromBug})";
return $response;
}
}
@@ -213,7 +213,7 @@ class taskZen extends task
{
if($change['field'] == 'status')
{
$response['callback'] = "parent.confirmBug('" . sprintf($this->lang->task->remindBug, $task->fromBug) . "', {$task->fromBug})";
$response['callback'] = "parent.confirmBug('" . sprintf($this->lang->task->remindBug, $task->fromBug) . "', {$task->fromBug})";
return $response;
}
}
module/upgrade/systemfiles.txt
+2 -2
View File
@@ -721,7 +721,7 @@
,bug/view/batchedit.html.php,
,bug/view/browse.html.php,
,bug/view/close.html.php,
,bug/view/confirmbug.html.php,
,bug/view/confirm.html.php,
,bug/view/create.html.php,
,bug/view/edit.html.php,
,bug/view/export.html.php,
@@ -731,7 +731,7 @@
,bug/view/m.assignto.html.php,
,bug/view/m.browse.html.php,
,bug/view/m.close.html.php,
,bug/view/m.confirmbug.html.php,
,bug/view/m.confirm.html.php,
,bug/view/m.create.html.php,
,bug/view/m.edit.html.php,
,bug/view/m.resolve.html.php,