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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
Catouse
2014-08-18 18:04:10 +08:00
parent ba84bb4abc 32584a0f0d
commit 365b46a8ea
22 changed files with 229 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+8 -1
View File
@@ -219,7 +219,14 @@ class bug extends control
$response['result'] = 'success';
$response['message'] = '';
$bugID = $this->bug->create();
$bugResult = $this->bug->create();
$bugID = $bugResult['id'];
if($bugResult['status'] == 'existed')
{
$response['locate'] = $this->createLink('bug', 'view', "bugID=$bugID");
$this->send($response);
}
if(dao::isError())
{
$response['result'] = 'fail';
module/bug/model.php
+14 -5
View File
@@ -54,12 +54,17 @@ class bugModel extends model
->join('mailto', ',')
->remove('files, labels')
->get();
/* Check repeat bug. */
$bugID = $this->loadModel('common')->checkRepeat('bug', 'check', $bug->title, "product={$bug->product}");
if($bugID) return array('status' => 'existed', 'id' => $bugID);
$this->dao->insert(TABLE_BUG)->data($bug)->autoCheck()->batchCheck($this->config->bug->create->requiredFields, 'notempty')->exec();
if(!dao::isError())
{
$bugID = $this->dao->lastInsertID();
$this->loadModel('file')->saveUpload('bug', $bugID);
return $bugID;
return array('status' => 'created', 'id' => $bugID);
}
return false;
}
@@ -74,10 +79,11 @@ class bugModel extends model
public function batchCreate($productID)
{
$this->loadModel('action');
$now = helper::now();
$actions = array();
$data = fixer::input('post')->get();
$batchNum = count(reset($data));
$now = helper::now();
$actions = array();
$data = fixer::input('post')->get();
$batchNum = count(reset($data));
$latestBugs = $this->loadModel('common')->checkRepeat('bug', 'get', '', "product=$productID");
for($i = 0; $i < $batchNum; $i++)
{
@@ -124,8 +130,11 @@ class bugModel extends model
$bug->assignedDate = $now;
}
if($latestBugs and in_array($bug->title, $latestBugs)) continue;
$this->dao->insert(TABLE_BUG)->data($bug)->autoCheck()->batchCheck($this->config->bug->create->requiredFields, 'notempty')->exec();
$bugID = $this->dao->lastInsertID();
$latestBugs[$bugID] = $bug->title;
if(dao::isError()) die(js::error('bug#' . ($i+1) . dao::getError(true)));
$actions[$bugID] = $this->action->create('bug', $bugID, 'Opened');