diff --git a/db/update9.5.1.sql b/db/update9.5.1.sql index 6274fc817b..50c22de4a3 100644 --- a/db/update9.5.1.sql +++ b/db/update9.5.1.sql @@ -58,7 +58,7 @@ CREATE TABLE IF NOT EXISTS `zt_log` ( `url` varchar(255) NOT NULL, `contentType` varchar(40) NOT NULL, `data` text NOT NULL, - `status` smallint(5) NOT NULL, + `result` text NOT NULL, PRIMARY KEY `id` (`id`), KEY `objectType` (`objectType`), KEY `obejctID` (`objectID`) diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 05fd1dd1cb..b82e62f4db 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -63,7 +63,7 @@ $lang->action->objectTypes['bug'] = 'Bug'; $lang->action->objectTypes['case'] = 'Case'; $lang->action->objectTypes['caseresult'] = 'Case Result'; $lang->action->objectTypes['stepresult'] = 'Case Steps'; -$lang->action->objectTypes['testtask'] = 'Test Task'; +$lang->action->objectTypes['testtask'] = 'Test Build'; $lang->action->objectTypes['user'] = 'User'; $lang->action->objectTypes['doc'] = 'Document'; $lang->action->objectTypes['doclib'] = 'Doc Lib'; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 5a4bd7f0b7..96e6aa1ca1 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -63,7 +63,7 @@ $lang->action->objectTypes['bug'] = 'Bug'; $lang->action->objectTypes['case'] = '用例'; $lang->action->objectTypes['caseresult'] = '用例结果'; $lang->action->objectTypes['stepresult'] = '用例步骤'; -$lang->action->objectTypes['testtask'] = '测试任务'; +$lang->action->objectTypes['testtask'] = '测试版本'; $lang->action->objectTypes['user'] = '用户'; $lang->action->objectTypes['doc'] = '文档'; $lang->action->objectTypes['doclib'] = '文档库'; diff --git a/module/entry/model.php b/module/entry/model.php index 2fc73aeddc..092c8c0556 100644 --- a/module/entry/model.php +++ b/module/entry/model.php @@ -23,6 +23,18 @@ class entryModel extends model return $this->dao->select('*')->from(TABLE_ENTRY)->where('id')->eq($entryID)->fetch(); } + /** + * Get an entry by code. + * + * @param string $code + * @access public + * @return array + */ + public function getByCode($code) + { + return $this->dao->select('*')->from(TABLE_ENTRY)->where('deleted')->eq('0')->andWhere('code')->eq($code)->fetch(); + } + /** * Get entry list. * @@ -93,4 +105,16 @@ class entryModel extends model return common::createChanges($oldEntry, $entry); } + + public function saveLog($entryID, $url) + { + $log = new stdclass(); + $log->objectType = 'entry'; + $log->objectID = $entryID; + $log->url = $url; + $log->date = helper::now(); + + $this->dao->insert(TABLE_LOG)->data($log)->exec(); + return !dao::isError(); + } } diff --git a/module/entry/view/create.html.php b/module/entry/view/create.html.php index 097f9bdf07..c159ef0a24 100644 --- a/module/entry/view/create.html.php +++ b/module/entry/view/create.html.php @@ -55,8 +55,7 @@ entry->apiIndex;?> - moduleVar}=moduleName&{$config->methodVar}=methodName&params=params";?> - + moduleVar}=moduleName&{$config->methodVar}=methodName&params=params&code=code&token=token";?> diff --git a/module/entry/view/edit.html.php b/module/entry/view/edit.html.php index 7a997621b0..9bdd029539 100644 --- a/module/entry/view/edit.html.php +++ b/module/entry/view/edit.html.php @@ -55,8 +55,7 @@ entry->apiIndex;?> - moduleVar}=moduleName&{$config->methodVar}=methodName&params=params";?> - + moduleVar}=moduleName&{$config->methodVar}=methodName&params=params&token=token";?> diff --git a/module/webhook/config.php b/module/webhook/config.php index f261ff89bb..7f69b69cd9 100644 --- a/module/webhook/config.php +++ b/module/webhook/config.php @@ -13,7 +13,7 @@ $config->webhook->objectTypes['story'] = array('opened', 'edited', 'commen $config->webhook->objectTypes['productplan'] = array('opened', 'edited'); //$config->webhook->objectTypes['release'] = array('opened', 'edited', 'changestatus'); $config->webhook->objectTypes['project'] = array('opened', 'edited', 'started', 'delayed', 'suspended', 'closed', 'activated', 'undeleted'); -$config->webhook->objectTypes['task'] = array('opened', 'edited', 'commented', 'assigned', 'confirmed', 'started', 'finished', 'editestimate', 'paused', 'canceled', 'restarted', 'closed', 'activated'); +$config->webhook->objectTypes['task'] = array('opened', 'edited', 'commented', 'assigned', 'confirmed', 'started', 'finished', 'paused', 'canceled', 'restarted', 'closed', 'activated'); //$config->webhook->objectTypes['build'] = array('opened', 'edited'); $config->webhook->objectTypes['bug'] = array('opened', 'edited', 'commented', 'assigned', 'confirmed', 'bugconfirmed', 'resolved', 'closed', 'activated'); $config->webhook->objectTypes['case'] = array('opened', 'edited', 'commented', 'reviewed', 'confirmed'); diff --git a/module/webhook/lang/zh-cn.php b/module/webhook/lang/zh-cn.php index 1ebd344a02..be16f050e3 100644 --- a/module/webhook/lang/zh-cn.php +++ b/module/webhook/lang/zh-cn.php @@ -5,7 +5,7 @@ $lang->webhook->api = '接口'; $lang->webhook->entry = '应用'; $lang->webhook->dingding = '钉钉'; $lang->webhook->log = '日志'; -$lang->webhook->assigend = '指派给'; +$lang->webhook->assigned = '指派给'; $lang->webhook->browse = '浏览钩子'; $lang->webhook->create = '添加钩子'; diff --git a/module/webhook/model.php b/module/webhook/model.php index 0fb152b733..211dd1b870 100644 --- a/module/webhook/model.php +++ b/module/webhook/model.php @@ -69,7 +69,7 @@ class webhookModel extends model $this->loadModel('action'); $actions = $this->dao->select('*')->from(TABLE_ACTION)->where('id')->in($actions)->fetchAll('id'); - + $users = $this->loadModel('user')->getPairs('noletter'); foreach($logs as $log) { if(!isset($actions[$log->action])) @@ -100,7 +100,7 @@ class webhookModel extends model */ public function getDataList() { - return $this->dao->select('*')->from(TABLE_WEBHOOKDATA)->where('status')->eq('wait')->orderBy('id')->fetchAll('id'); + return $this->dao->select('*')->from(TABLE_WEBHOOKDATAS)->where('status')->eq('wait')->orderBy('id')->fetchAll('id'); } /** @@ -317,6 +317,7 @@ class webhookModel extends model $oldOnlyBody = 'yes'; unset($_GET['onlybody']); } + if($objectType == 'case') $objectType = 'testcase'; $viewLink = helper::createLink($objectType, 'view', "id=$objectID"); if($oldOnlyBody) $_GET['onlybody'] = $oldOnlyBody; @@ -401,7 +402,7 @@ class webhookModel extends model $webhookData->createdBy = $this->app->user->account; $webhookData->createdDate = helper::now(); - $this->dao->insert(TABLE_WEBHOOKDATA)->data($webhookData)->exec(); + $this->dao->insert(TABLE_WEBHOOKDATAS)->data($webhookData)->exec(); return !dao::isError(); }