From b4e520789736d41546a49df6a5065556eb28c816 Mon Sep 17 00:00:00 2001 From: "chencongzhi520@gmail.com" Date: Fri, 8 Jun 2012 07:30:19 +0000 Subject: [PATCH] * Remove bug-batchEdit as plugin. --- module/bug/control.php | 75 ---------------------------- module/bug/js/batchedit.js | 18 ------- module/bug/lang/en.php | 1 - module/bug/lang/zh-cn.php | 1 - module/bug/model.php | 80 ------------------------------ module/bug/view/batchedit.html.php | 59 ---------------------- module/bug/view/browse.html.php | 1 - 7 files changed, 235 deletions(-) delete mode 100755 module/bug/js/batchedit.js delete mode 100755 module/bug/view/batchedit.html.php diff --git a/module/bug/control.php b/module/bug/control.php index 17667a03fc..2e0d2450ba 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -457,81 +457,6 @@ class bug extends control $this->display(); } - /** - * Batch edit bug. - * - * @param string $from example:bugBrowse, bugBatchEdit. - * @param int $productID - * @param string $orderBy - * @access public - * @return void - */ - public function batchEdit($from = '', $productID = 0, $orderBy = '') - { - if($from == 'bugBrowse') - { - /* Initialize vars.*/ - if(!$orderBy) $orderBy = $this->cookie->qaBugOrder ? $this->cookie->qaBugOrder : 'id_desc'; - $editedBugs = array(); - $allBugs = $this->dao->select('*')->from(TABLE_BUG)->alias('t1')->where($this->session->bugReportCondition)->orderBy($orderBy)->fetchAll('id'); - $bugIDList = $this->post->bugIDList ? $this->post->bugIDList : array(); - $product = $this->product->getByID($productID); - $columns = 9; - $showSuhosinInfo = false; - - /* Set product menu. */ - $this->bug->setMenu($this->products, $productID); - - /* Initialize the tasks whose need to edited. */ - foreach($allBugs as $bug) if(in_array($bug->id, $bugIDList)) $editedBugs[$bug->id] = $bug; - - /* Judge whether the editedTasks is too large. */ - $showSuhosinInfo = $this->loadModel('common')->judgeSuhosinSetting(count($editedBugs), $columns); - - /* Set the sessions. */ - $this->app->session->set('showSuhosinInfo', $showSuhosinInfo); - - /* Assign. */ - $this->view->header['title'] = $product->name . $this->lang->colon . $this->lang->bug->batchEdit; - $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]); - $this->view->position[] = $this->lang->bug->common; - $this->view->position[] = $this->lang->bug->batchEdit; - - if($showSuhosinInfo) $this->view->suhosinInfo = $this->lang->suhosinInfo; - $this->view->productID = $productID; - $this->view->editedBugs = $editedBugs; - $this->view->users = $this->user->getPairs('noletter'); - - $this->display(); - } - elseif($from == 'bugBatchEdit') - { - $allChanges = $this->bug->batchUpdate(); - - foreach($allChanges as $bugID => $changes) - { - $actionID = $this->action->create('bug', $bugID, 'Edited'); - $this->action->logHistory($actionID, $changes); - $this->sendmail($bugID, $actionID); - - $bug = $this->bug->getById($bugID); - if($bug->toTask != 0) - { - foreach($changes as $change) - { - if($change['field'] == 'status') - { - $confirmURL = $this->createLink('task', 'view', "taskID=$bug->toTask"); - $cancelURL = $this->server->HTTP_REFERER; - die(js::confirm(sprintf($this->lang->bug->remindTask, $bug->task), $confirmURL, $cancelURL, 'parent', 'parent')); - } - } - } - } - die(js::locate($this->session->bugList, 'parent')); - } - } - /** * Update assign of bug. * diff --git a/module/bug/js/batchedit.js b/module/bug/js/batchedit.js deleted file mode 100755 index 0b26083423..0000000000 --- a/module/bug/js/batchedit.js +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Set duplicate field. - * - * @param string $resolution - * @access public - * @return void - */ -function setDuplicate(resolution, bugID) -{ - if(resolution == 'duplicate') - { - $('#duplicateBugBox' + bugID).show(); - } - else - { - $('#duplicateBugBox' + bugID).hide(); - } -} diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 729908efd9..00440be357 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -69,7 +69,6 @@ $lang->bug->index = 'Index'; $lang->bug->create = 'Create Bug'; $lang->bug->confirmBug = 'Confirm Bug'; $lang->bug->edit = 'Edit Bug'; -$lang->bug->batchEdit = 'Batch edit'; $lang->bug->assignTo = 'Assign'; $lang->bug->browse = 'Browse Bug'; $lang->bug->view = 'Bug Info'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index d3a76f7f7f..8b2dcaf124 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -69,7 +69,6 @@ $lang->bug->index = '首页'; $lang->bug->create = '创建Bug'; $lang->bug->confirmBug = '确认'; $lang->bug->edit = '编辑Bug'; -$lang->bug->batchEdit = '批量编辑'; $lang->bug->assignTo = '指派'; $lang->bug->browse = 'Bug列表'; $lang->bug->view = 'Bug详情'; diff --git a/module/bug/model.php b/module/bug/model.php index 839aa00dc3..9cd3507c18 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -193,86 +193,6 @@ class bugModel extends model if(!dao::isError()) return common::createChanges($oldBug, $bug); } - /** - * Batch update bug. - * - * @access public - * @return void - */ - public function batchUpdate() - { - $bugs = array(); - $allChanges = array(); - $now = helper::now(); - $bugIDList = $this->post->bugIDList ? $this->post->bugIDList : array(); - - /* Adjust whether the post data is complete, if not, remove the last element of $bugIDList. */ - if($this->session->showSuhosinInfo) array_pop($bugIDList); - - if(!empty($bugIDList)) - { - /* Initialize bugs from the post data.*/ - foreach($bugIDList as $bugID) - { - $oldBug = $this->getByID($bugID); - - $bug->lastEditedBy = $this->app->user->account; - $bug->lastEditedDate = $now; - $bug->type = $this->post->types[$bugID]; - $bug->severity = $this->post->severities[$bugID]; - $bug->pri = $this->post->pris[$bugID]; - $bug->status = $this->post->statuses[$bugID]; - $bug->title = htmlspecialchars($this->post->titles[$bugID]); - $bug->assignedTo = $this->post->assignedTos[$bugID]; - $bug->resolvedBy = $this->post->resolvedBys[$bugID]; - $bug->resolution = $this->post->resolutions[$bugID]; - $bug->duplicateBug = $this->post->duplicateBugs[$bugID] ? $this->post->duplicateBugs[$bugID] : $oldBug->duplicateBug; - - if($bug->assignedTo != $oldBug->assignedTo) $bug->assignedDate = $now; - if($bug->resolvedBy != '' or $bug->resolution != '') $bug->resolvedDate = $now; - if($bug->resolution != '' and $bug->resolvedBy == '') $bug->resolvedBy = $this->app->user->account; - if($bug->resolution != '') - { - $bug->status = 'resolved'; - $bug->confirmed = 1; - } - if($bug->resolution != '' and $bug->assignedTo == '') - { - $bug->assignedTo = $oldBug->openedBy; - $bug->assignedDate = $now; - } - - $bugs[$bugID] = $bug; - unset($bug); - } - - /* Update bugs. */ - foreach($bugs as $bugID => $bug) - { - $oldBug = $this->getByID($bugID); - - $this->dao->update(TABLE_BUG)->data($bug) - ->autoCheck() - ->batchCheck($this->config->bug->edit->requiredFields, 'notempty') - ->checkIF($bug->resolvedBy, 'resolution', 'notempty') - ->checkIF($bug->resolution == 'duplicate', 'duplicateBug', 'notempty') - ->where('id')->eq((int)$bugID) - ->exec(); - - if(!dao::isError()) - { - $allChanges[$bugID] = common::createChanges($oldBug, $bug); - } - else - { - die(js::error('bug#' . $bugID . dao::getError(true))); - } - } - } - - return $allChanges; - } - /** * Assign a bug to a user again. * diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php deleted file mode 100755 index ea96d47a71..0000000000 --- a/module/bug/view/batchedit.html.php +++ /dev/null @@ -1,59 +0,0 @@ - - * @package bug - * @version $Id$ - * @link http://www.zentao.net - */ -?> - -
"> - - - - - - - - - - - - - - - type != 'designchange') unset($this->lang->bug->typeList['designchange']); - if($bug->type != 'newfeature') unset($this->lang->bug->typeList['newfeature']); - if($bug->type != 'trackthings') unset($this->lang->bug->typeList['trackthings']); - ?> - - - - - - - - - - - - - - - - -
bug->common . $lang->colon . $lang->bug->batchEdit;?>
idAB;?>bug->type;?>bug->severityAB;?>bug->pri;?> bug->title;?>bug->assignedTo;?>bug->status;?>bug->resolvedByAB;?>bug->resolutionAB;?>
id . html::hidden("bugIDList[$bug->id]", $bug->id);?>id]", $lang->bug->typeList, $bug->type, 'class=select-1');?>id]", (array)$lang->bug->severityList, $bug->severity, 'class=select-1');?>id]", (array)$lang->bug->priList, $bug->pri, 'class=select-1');?>id]", $bug->title, 'class=text-1'); echo "*";?>id]", $users, $bug->assignedTo, 'class=select-1');?>id]", (array)$lang->bug->statusList, $bug->status, 'class=select-1');?>id]", $users, $bug->resolvedBy, 'class=select-1');?> -
id]", $this->lang->bug->resolutionList, $bug->resolution, "class=w-80px onchange=setDuplicate(this.value,$bug->id)");?>
-
id;?>' resolution != 'duplicate') echo "style='display:none'";?>>id]", '', "class=w-40px placeholder='{$lang->bug->duplicateBug}'");?>
-
-
- diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 2509b98aee..249373dcdf 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -154,7 +154,6 @@ var customed = ;
bug->batchEdit); foreach($lang->bug->statusList as $status => $label) { if($status != 'active')