From 0f2eb04f6aa0fbe36e5f746e52ff52cc311d3b0a Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 27 Oct 2017 14:21:12 +0800 Subject: [PATCH 1/6] =?UTF-8?q?Fix=20bug#1258=20=E6=AF=8F=E6=97=A5?= =?UTF-8?q?=E6=8F=90=E9=86=92=E6=9C=89=E9=94=99=E8=AF=AF=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/report/control.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/report/control.php b/module/report/control.php index 3b39da197c..83ac588831 100644 --- a/module/report/control.php +++ b/module/report/control.php @@ -210,6 +210,8 @@ class report extends control /* Get email content and title.*/ $this->view->mail = $mail; + $this->view->mailTitle = $mailTitle; + $oldViewType = $this->viewType; if($oldViewType == 'json') $this->viewType = 'html'; $mailContent = $this->parse('report', 'dailyreminder'); From 1b82933c0db4c77654f7edb2f242bcb2f1c4a6ad Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 30 Oct 2017 11:32:53 +0800 Subject: [PATCH 2/6] =?UTF-8?q?Finish=20task#3237=20=E6=89=80=E6=9C=89?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=20/=E6=89=80=E6=9C=89=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD,cost:2=20left:0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/filter.php | 2 ++ module/product/config.php | 3 ++ module/product/control.php | 49 +++++++++++++++++++++++++++ module/product/lang/en.php | 8 +++++ module/product/lang/zh-cn.php | 9 +++++ module/product/view/all.html.php | 16 +++++---- module/product/view/export.html.php | 13 ++++++++ module/project/config.php | 3 ++ module/project/control.php | 52 +++++++++++++++++++++++++++++ module/project/lang/en.php | 1 + module/project/lang/zh-cn.php | 1 + module/project/view/all.html.php | 1 + module/project/view/export.html.php | 13 ++++++++ 13 files changed, 165 insertions(+), 6 deletions(-) create mode 100644 module/product/view/export.html.php create mode 100644 module/project/view/export.html.php diff --git a/config/filter.php b/config/filter.php index 99e4c601cd..ee9d0880b3 100644 --- a/config/filter.php +++ b/config/filter.php @@ -111,6 +111,7 @@ $filter->product->browse->cookie['storyModule'] = 'int'; $filter->product->default->cookie['lastProduct'] = 'int'; $filter->product->default->cookie['preProductID'] = 'int'; $filter->product->index->cookie['preBranch'] = 'int'; +$filter->product->export->cookie['checkedItem'] = 'reg::checked'; $filter->project->default->cookie['lastProject'] = 'int'; $filter->project->default->cookie['projectMode'] = 'code'; @@ -120,6 +121,7 @@ $filter->project->task->cookie['preProjectID'] = 'int'; $filter->project->task->cookie['productBrowseParam'] = 'int'; $filter->project->task->cookie['projectTaskOrder'] = 'reg::orderBy'; $filter->project->task->cookie['windowWidth'] = 'int'; +$filter->project->export->cookie['checkedItem'] = 'reg::checked'; $filter->qa->default->cookie['lastProduct'] = 'int'; $filter->qa->default->cookie['preBranch'] = 'int'; diff --git a/module/product/config.php b/module/product/config.php index f0b1a036d8..b47f613d0c 100644 --- a/module/product/config.php +++ b/module/product/config.php @@ -7,6 +7,9 @@ $config->product->customBatchEditFields = 'PO,QD,RD,status,type,desc'; $config->product->custom = new stdclass(); $config->product->custom->batchEditFields = 'PO,QD,RD,status'; +$config->product->list = new stdclass(); +$config->product->list->exportFields = 'id,name,activeStories,changedStories,draftStories,closedStories,plans,releases,bugs,unResolvedBugs,assignToNullBugs'; + global $lang, $app; $app->loadLang('story'); $config->product->search['module'] = 'story'; diff --git a/module/product/control.php b/module/product/control.php index 9b2977fade..67894978b1 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -660,6 +660,55 @@ class product extends control $this->display(); } + /** + * Export product. + * + * @param string $status + * @param string $orderBy + * @access public + * @return void + */ + public function export($status, $orderBy) + { + if($_POST) + { + $productLang = $this->lang->product; + $productConfig = $this->config->product; + + /* Create field lists. */ + $fields = $this->post->exportFields ? $this->post->exportFields : explode(',', $productConfig->list->exportFields); + foreach($fields as $key => $fieldName) + { + $fieldName = trim($fieldName); + $fields[$fieldName] = zget($productLang, $fieldName); + unset($fields[$key]); + } + + $productStats = $this->product->getStats($orderBy, null, $status); + foreach($productStats as $i => $product) + { + $product->activeStories = (int)$product->stories['active']; + $product->changedStories = (int)$product->stories['changed']; + $product->draftStories = (int)$product->stories['draft']; + $product->closedStories = (int)$product->stories['closed']; + $product->unResolvedBugs = (int)$product->unResolved; + $product->assignToNullBugs = (int)$product->assignToNull; + + if($this->post->exportType == 'selected') + { + $checkedItem = $this->cookie->checkedItem; + if(strpos(",$checkedItem,", ",{$product->id},") === false) unset($productStats[$i]); + } + } + + $this->post->set('fields', $fields); + $this->post->set('rows', $productStats); + $this->post->set('kind', 'product'); + $this->fetch('file', 'export2' . $this->post->fileType, $_POST); + } + $this->display(); + } + /** * Doc for compatible. * diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 563b50f988..6d2a7c0556 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -26,6 +26,7 @@ $lang->product->other = 'Other:'; $lang->product->closed = 'Closed'; $lang->product->updateOrder = 'Ranking'; $lang->product->all = "All {$lang->productCommon}"; +$lang->product->export = "Export"; $lang->product->basicInfo = 'Basic Info'; $lang->product->otherInfo = 'Other Info'; @@ -42,6 +43,13 @@ $lang->product->doc = 'Documents'; $lang->product->project = $lang->projectCommon . 'List'; $lang->product->build = 'Build List'; +$lang->product->activeStories = 'Activated Story'; +$lang->product->changedStories = 'Changed Story'; +$lang->product->draftStories = 'Draft Story'; +$lang->product->closedStories = 'Closed Story'; +$lang->product->unResolvedBugs = 'Unresolved Bug'; +$lang->product->assignToNullBugs = 'No Assigned Bug'; + $lang->product->confirmDelete = " Do you want to delete {$lang->productCommon}?"; $lang->product->errorNoProduct = "{$lang->productCommon} is not created yet!"; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index d0be9f125e..a9e87d8f87 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -26,6 +26,7 @@ $lang->product->other = '其他：'; $lang->product->closed = '已关闭'; $lang->product->updateOrder = "排序"; $lang->product->all = "所有{$lang->productCommon}"; +$lang->product->export = "导出"; $lang->product->basicInfo = '基本信息'; $lang->product->otherInfo = '其他信息'; @@ -42,11 +43,19 @@ $lang->product->doc = '文档列表'; $lang->product->project = $lang->projectCommon . '列表'; $lang->product->build = '版本列表'; +$lang->product->activeStories = '激活需求'; +$lang->product->changedStories = '已变更需求'; +$lang->product->draftStories = '草稿需求'; +$lang->product->closedStories = '已关闭需求'; +$lang->product->unResolvedBugs = '未解决Bug'; +$lang->product->assignToNullBugs = '未指派Bug'; + $lang->product->confirmDelete = " 您确定删除该{$lang->productCommon}吗？"; $lang->product->errorNoProduct = "还没有创建{$lang->productCommon}！"; $lang->product->accessDenied = "您无权访问该{$lang->productCommon}"; +$lang->product->id = "编号"; $lang->product->name = "{$lang->productCommon}名称"; $lang->product->code = "{$lang->productCommon}代号"; $lang->product->order = '排序'; diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php index f1cf762c1b..250e5133d0 100644 --- a/module/product/view/all.html.php +++ b/module/product/view/all.html.php @@ -13,6 +13,10 @@
+ createLink('product', 'export', "status=$status&orderBy=$orderBy"); + if(common::hasPriv('product', 'export'))echo html::a($link, " " . $lang->export, '', "class='export btn'"); + ?> createLink('product', 'create'), " " . $lang->product->create,'', "class='btn'") ?>
    @@ -42,15 +46,15 @@ idAB);?> product->name);?> - story->statusList['active'] . $lang->story->common;?> - story->statusList['changed'] . $lang->story->common;?> - story->statusList['draft'] . $lang->story->common;?> - story->statusList['closed'] . $lang->story->common;?> + product->activeStories;?> + product->changedStories;?> + product->draftStories;?> + product->closedStories;?> product->plans;?> product->releases;?> product->bugs;?> - bug->unResolved;?> - bug->assignToNull;?> + product->unResolvedBugs;?> + product->assignToNullBugs;?> product->updateOrder);?> diff --git a/module/product/view/export.html.php b/module/product/view/export.html.php new file mode 100644 index 0000000000..c599799e2b --- /dev/null +++ b/module/product/view/export.html.php @@ -0,0 +1,13 @@ + + * @package product + * @version $Id$ + * @link http://www.zentao.net + */ +?> + diff --git a/module/project/config.php b/module/project/config.php index 471dc898f3..1af2a0f2c9 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -5,6 +5,9 @@ $config->project->orderBy = 'isDone,status,order_desc'; $config->project->maxBurnDay = '31'; $config->project->weekend = '2'; +$config->project->list = new stdclass(); +$config->project->list->exportFields = 'id,name,code,PM,end,status,totalEstimate,totalConsumed,totalLeft,progess'; + global $lang, $app; $app->loadLang('task'); $config->project->create = new stdclass(); diff --git a/module/project/control.php b/module/project/control.php index eee780130c..e651b7e440 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -2032,6 +2032,58 @@ class project extends control $this->display(); } + /** + * Export project. + * + * @param string $status + * @param int $productID + * @param string $orderBy + * @access public + * @return void + */ + public function export($status, $productID, $orderBy) + { + if($_POST) + { + $projectLang = $this->lang->project; + $projectConfig = $this->config->project; + + /* Create field lists. */ + $fields = $this->post->exportFields ? $this->post->exportFields : explode(',', $projectConfig->list->exportFields); + foreach($fields as $key => $fieldName) + { + $fieldName = trim($fieldName); + $fields[$fieldName] = zget($projectLang, $fieldName); + unset($fields[$key]); + } + + $projectStats = $this->project->getProjectStats($status == 'byproduct' ? 'all' : $status, $productID, 0, 30, $orderBy, null); + $users = $this->loadModel('user')->getPairs('noletter'); + foreach($projectStats as $i => $project) + { + $project->PM = zget($users, $project->PM); + $project->status = isset($project->delay) ? $projectLang->delayed : $projectLang->statusList[$project->status]; + $project->totalEstimate = $project->hours->totalEstimate; + $project->totalConsumed = $project->hours->totalConsumed; + $project->totalLeft = $project->hours->totalLeft; + $project->progress = $project->hours->progress . '%'; + + if($this->post->exportType == 'selected') + { + $checkedItem = $this->cookie->checkedItem; + if(strpos(",$checkedItem,", ",{$project->id},") === false) unset($projectStats[$i]); + } + } + + $this->post->set('fields', $fields); + $this->post->set('rows', $projectStats); + $this->post->set('kind', 'project'); + $this->fetch('file', 'export2' . $this->post->fileType, $_POST); + } + + $this->display(); + } + /** * Doc for compatible. * diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 415eb80747..fdeae95528 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -58,6 +58,7 @@ $lang->project->activate = 'Activate'; $lang->project->putoff = 'Deplay'; $lang->project->suspend = 'Suspend'; $lang->project->close = 'Close'; +$lang->project->export = 'Export'; $lang->project->typeList['sprint'] = 'Sprint'; $lang->project->typeList['waterfall'] = 'Waterfall'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index f35ba6f90a..6dbfd2d991 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -58,6 +58,7 @@ $lang->project->activate = '激活'; $lang->project->putoff = '延期'; $lang->project->suspend = '挂起'; $lang->project->close = '关闭'; +$lang->project->export = '导出'; $lang->project->typeList['sprint'] = "短期$lang->projectCommon"; $lang->project->typeList['waterfall'] = "长期$lang->projectCommon"; diff --git a/module/project/view/all.html.php b/module/project/view/all.html.php index c751a80672..45d11f03b9 100644 --- a/module/project/view/all.html.php +++ b/module/project/view/all.html.php @@ -14,6 +14,7 @@
    + " . $lang->export, '', "class='btn export'")?> " . $lang->project->create, '', "class='btn'")?>
      diff --git a/module/project/view/export.html.php b/module/project/view/export.html.php new file mode 100644 index 0000000000..b1c32b73eb --- /dev/null +++ b/module/project/view/export.html.php @@ -0,0 +1,13 @@ + + * @package project + * @version $Id$ + * @link http://www.zentao.net + */ +?> + From 3076736e9eee5b5a3f80a5cbc321b571977fb1f0 Mon Sep 17 00:00:00 2001 From: liugang Date: Mon, 30 Oct 2017 14:26:51 +0800 Subject: [PATCH 3/6] * Set default msgtype as markdown for dingding. --- module/entry/view/browse.html.php | 10 +- module/entry/view/header.html.php | 3 +- module/webhook/control.php | 18 ++-- module/webhook/js/create.js | 9 ++ module/webhook/lang/zh-cn.php | 16 +++- module/webhook/model.php | 142 +++++++++++++++------------- module/webhook/view/browse.html.php | 10 +- module/webhook/view/create.html.php | 22 +++-- module/webhook/view/edit.html.php | 4 +- module/webhook/view/header.html.php | 6 +- module/webhook/view/log.html.php | 2 +- 11 files changed, 133 insertions(+), 109 deletions(-) diff --git a/module/entry/view/browse.html.php b/module/entry/view/browse.html.php index 62b3b89000..116fd12509 100644 --- a/module/entry/view/browse.html.php +++ b/module/entry/view/browse.html.php @@ -27,9 +27,9 @@ - + $entry):?> - id;?> + name;?> code;?> key;?> @@ -37,11 +37,11 @@ desc;?> id", '', 'list', 'file-text-o'); - common::printIcon('entry', 'edit', "entryID=$entry->id", '', 'list'); + common::printIcon('entry', 'log', "entryID=$id", '', 'list', 'file-text-o'); + common::printIcon('entry', 'edit', "entryID=$id", '', 'list'); if(common::hasPriv('entry', 'delete')) { - $deleteURL = $this->createLink('entry', 'delete', "entryID=$entry->id&confirm=yes"); + $deleteURL = $this->createLink('entry', 'delete', "entryID=$id&confirm=yes"); echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"entryList\",confirmDelete)", '', '', "title='{$lang->entry->delete}' class='btn-icon'"); } ?> diff --git a/module/entry/view/header.html.php b/module/entry/view/header.html.php index e427205cf9..3beccaee33 100644 --- a/module/entry/view/header.html.php +++ b/module/entry/view/header.html.php @@ -15,8 +15,7 @@
        "; common::printLink('entry', 'browse', '', $lang->entry->common); echo ''; - echo "
      • "; common::printLink('webhook', 'browse', 'type=default', $lang->entry->webhook); echo '
        • '; - echo "
      • "; common::printLink('webhook', 'browse', 'type=dingding', $lang->entry->dingding); echo '
        • '; + echo "
      • "; common::printLink('webhook', 'browse', '', $lang->entry->webhook); echo '
        • '; ?>
      diff --git a/module/webhook/control.php b/module/webhook/control.php index 9f768555d6..537aff09c0 100644 --- a/module/webhook/control.php +++ b/module/webhook/control.php @@ -14,7 +14,6 @@ class webhook extends control /** * Browse webhooks. * - * @param string $type * @param string $orderBy * @param int $recTotal * @param int $recPerPage @@ -22,14 +21,13 @@ class webhook extends control * @access public * @return void */ - public function browse($type = '', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) + public function browse($orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { $this->app->loadClass('pager', $static = true); $pager = new pager($recTotal, $recPerPage, $pageID); $this->view->title = $this->lang->webhook->api . $this->lang->colon . $this->lang->webhook->list; - $this->view->webhooks = $this->webhook->getList($type, $orderBy, $pager); - $this->view->type = $type; + $this->view->webhooks = $this->webhook->getList($orderBy, $pager); $this->view->orderBy = $orderBy; $this->view->pager = $pager; $this->display(); @@ -38,17 +36,16 @@ class webhook extends control /** * Create a webhook. * - * @param string $type * @access public * @return void */ - public function create($type = '') + public function create() { if($_POST) { - $this->webhook->create($type); + $this->webhook->create(); if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError())); - $this->send(array('result' => 'success', 'message' => $this->lang->webhook->saveSuccess, 'locate' => inlink('browse', "type=$type"))); + $this->send(array('result' => 'success', 'message' => $this->lang->webhook->saveSuccess, 'locate' => inlink('browse'))); } $this->app->loadLang('action'); @@ -57,7 +54,6 @@ class webhook extends control $this->view->projects = $this->loadModel('project')->getPairs(); $this->view->objectTypes = $this->webhook->getObjectTypes(); $this->view->objectActions = $this->webhook->getObjectActions(); - $this->view->type = $type; $this->display(); } @@ -75,7 +71,7 @@ class webhook extends control { $this->webhook->update($id); if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError())); - $this->send(array('result' => 'success', 'message' => $this->lang->webhook->saveSuccess, 'locate' => inlink('browse', "type=$webhook->type"))); + $this->send(array('result' => 'success', 'message' => $this->lang->webhook->saveSuccess, 'locate' => inlink('browse'))); } $this->app->loadLang('action'); @@ -136,7 +132,7 @@ class webhook extends control */ public function asyncSend() { - $webhooks = $this->webhook->getList($type = '', $orderBy = 'id_desc', $pager = null, $decode = false); + $webhooks = $this->webhook->getList($orderBy = 'id_desc', $pager = null, $decode = false); if(empty($webhooks)) { echo "NO WEBHOOK EXIST.\n"; diff --git a/module/webhook/js/create.js b/module/webhook/js/create.js index 9fed36bc05..1842b61b8d 100644 --- a/module/webhook/js/create.js +++ b/module/webhook/js/create.js @@ -1,5 +1,14 @@ $(function() { + $('#type').change(function() + { + var type = $(this).val(); + $('#contentTypeTR').toggle(type != 'dingding'); + $('#sendTypeTR').toggle(type != 'dingding'); + $('#paramsTR').toggle(type != 'bearychat' && type != 'dingding'); + $('#urlNote').html(urlNote[type]); + }); + $('.objectType').click(function() { if($(this).prop('checked')) diff --git a/module/webhook/lang/zh-cn.php b/module/webhook/lang/zh-cn.php index a646844c45..f7d2be68b9 100644 --- a/module/webhook/lang/zh-cn.php +++ b/module/webhook/lang/zh-cn.php @@ -3,7 +3,6 @@ $lang->webhook->common = 'webhook'; $lang->webhook->list = '钩子列表'; $lang->webhook->api = '接口'; $lang->webhook->entry = '应用'; -$lang->webhook->dingding = '钉钉'; $lang->webhook->log = '日志'; $lang->webhook->assigned = '指派给'; @@ -31,6 +30,10 @@ $lang->webhook->date = '发送时间'; $lang->webhook->data = '数据'; $lang->webhook->result = '结果'; +$lang->webhook->typeList['bearychat'] = '倍洽'; +$lang->webhook->typeList['dingding'] = '钉钉'; +$lang->webhook->typeList['default'] = '默认'; + $lang->webhook->sendTypeList['sync'] = '同步'; $lang->webhook->sendTypeList['async'] = '异步'; @@ -50,7 +53,10 @@ $lang->webhook->confirmDelete = '您确认要删除该webhook吗？'; $lang->webhook->trimWords = '了'; $lang->webhook->note = new stdClass(); -$lang->webhook->note->async = '异步需要打开计划任务'; -$lang->webhook->note->dingding = '请在钉钉中添加一个自定义机器人，并将其webhook填写到此处。'; -$lang->webhook->note->product = '此项为空时所有产品的动作都会触发钩子，否则只有关联产品的动作才会触发。'; -$lang->webhook->note->project = '此项为空时所有项目的动作都会触发钩子，否则只有关联项目的动作才会触发。'; +$lang->webhook->note->async = '异步需要打开计划任务'; +$lang->webhook->note->product = '此项为空时所有产品的动作都会触发钩子，否则只有关联产品的动作才会触发。'; +$lang->webhook->note->project = '此项为空时所有项目的动作都会触发钩子，否则只有关联项目的动作才会触发。'; + +$lang->webhook->note->typeList['bearychat'] = '请在倍洽中添加一个禅道机器人，并将其webhook填写到此处。'; +$lang->webhook->note->typeList['dingding'] = '请在钉钉中添加一个自定义机器人，并将其webhook填写到此处。'; +$lang->webhook->note->typeList['default'] = '从第三方系统获取webhook并填写到此处。'; diff --git a/module/webhook/model.php b/module/webhook/model.php index 16699baf5d..a2d13954a6 100644 --- a/module/webhook/model.php +++ b/module/webhook/model.php @@ -28,18 +28,16 @@ class webhookModel extends model /** * Get webhook list. * - * @param string $type * @param string $orderBy * @param object $pager * @param bool $decode * @access public * @return array */ - public function getList($type = '', $orderBy = 'id_desc', $pager = null, $decode = true) + public function getList($orderBy = 'id_desc', $pager = null, $decode = true) { $webhooks = $this->dao->select('*')->from(TABLE_WEBHOOK) ->where('deleted')->eq('0') - ->beginIF($type)->andWhere('type')->eq($type)->fi() ->orderBy($orderBy) ->page($pager) ->fetchAll('id'); @@ -142,14 +140,12 @@ class webhookModel extends model /** * Create a webhook. * - * @param string $type * @access public * @return bool */ - public function create($type) + public function create() { $webhook = fixer::input('post') - ->add('type', $type) ->add('createdBy', $this->app->user->account) ->add('createdDate', helper::now()) ->join('products', ',') @@ -241,6 +237,7 @@ class webhookModel extends model */ public function buildData($objectType, $objectID, $actionType, $actionID, $webhook) { + /* Validate data. */ if(!isset($this->lang->action->label)) $this->loadModel('action'); if(!isset($this->lang->action->label->$actionType)) return false; if(empty($this->config->objectTables[$objectType])) return false; @@ -262,69 +259,43 @@ class webhookModel extends model $object = $this->dao->select('*')->from($this->config->objectTables[$objectType])->where('id')->eq($objectID)->fetch(); $field = $this->config->action->objectNameFields[$objectType]; - $text = $object->$field; $host = common::getSysURL(); $viewLink = $this->getViewLink($objectType, $objectID); + $title = $this->app->user->realname . $this->lang->action->label->$actionType . $this->lang->action->objectTypes[$objectType]; + $text = $title . ' ' . "[#{$objectID}::{$object->$field}](" . $host . $viewLink . ")"; + + $mobile = ''; + $email = ''; + if($actionType == 'assigned') + { + $assignedTo = $object->assignedTo; + foreach($users as $user) + { + if($user->account == $object->assignedTo) + { + $assignedTo = $user->realname; + $mobile = $user->mobile; + $email = $user->email; + break; + } + } + $text .= ' ' . $this->lang->webhook->assigned . ' ' . $assignedTo; + } + $action->text = $text; - $data = new stdclass(); if($webhook->type == 'dingding') { - $title = $this->app->user->realname . $this->lang->action->label->$actionType . $this->lang->action->objectTypes[$objectType]; - $mobile = ''; - if($actionType == 'assigned') - { - $assignedTo = $object->assignedTo; - foreach($users as $user) - { - if($user->account == $object->assignedTo) - { - $assignedTo = $user->realname; - $mobile = $user->mobile; - break; - } - } - if($mobile) $title .= ' ' . "[#{$objectID}::{$title}](" . $host . $viewLink . ")"; - $title .= ' ' . $this->lang->webhook->assigned . ' ' . $assignedTo; - } - - if($mobile) - { - $at = new stdclass(); - $at->atMobiles = array($mobile); - $at->isAtAll = false; - - $data->msgtype = 'text'; - $data->text = array('content' => $title); - $data->at = $at; - } - else - { - $link = new stdclass(); - $link->text = "[#{$objectID}::{$text}]"; - $link->title = $title; - $link->picUrl = ''; - $link->messageUrl = $host . $viewLink; - - $data->msgtype = 'link'; - $data->link = $link; - } - - return helper::jsonEncode($data); + $data = $this->getDingdingData($title, $text, $mobile); } - - foreach(explode(',', $webhook->params) as $param) + elseif($webhook->type == 'bearychat') { - if($param == 'text') - { - $data->text = $this->app->user->realname . $this->lang->action->label->$actionType . $this->lang->action->objectTypes[$objectType] . ' ' . "[#{$objectID}::{$text}](" . $host . $viewLink . ")"; - if($actionType == 'assigned') $data->text .= ' ' . $this->lang->webhook->assigned . ' ' . zget($users, $object->assignedTo); - } - else - { - $data->$param = $action->$param; - } + $data = $this->getBearychatData($text, $mobile, $email, $objectType, $objectID); + } + else + { + $data = new stdclass(); + foreach(explode(',', $webhook->params) as $param) $data->$param = $action->$param; } - $data = $this->getFiles($data, $objectType, $objectID); return helper::jsonEncode($data); } @@ -353,16 +324,58 @@ class webhookModel extends model } /** - * Get files. + * Get hook data for dingding. * - * @param object $data + * @param string $title + * @param string $text + * @param string $mobile + * @access public + * @return object + */ + public function getDingdingData($title, $text, $mobile) + { + $markdown = new stdclass(); + $markdown->title = $title; + $markdown->text = $text; + + $data = new stdclass(); + if($mobile) + { + $at = new stdclass(); + $at->atMobiles = array($mobile); + $at->isAtAll = false; + + $data->msgtype = 'text'; + $data->text = array('content' => $text); + $data->at = $at; + } + else + { + $data->msgtype = 'markdown'; + $data->markdown = $markdown; + } + + return $data; + } + + /** + * Get hook data for bearychat. + * + * @param string $text + * @param string $mobile + * @param string $email * @param string $objectType * @param int $objectID * @access public * @return object */ - public function getFiles($data, $objectType, $objectID) + public function getBearychatData($text, $mobile, $email, $objectType, $objectID) { + $data = new stdclass(); + $data->text = $text; + $data->markdown = 'true'; + $data->user = $mobile ? $mobile : ($email ? $email : $this->app->user->account); + if(!empty($_FILES['files']['name'][0])) { $this->loadModel('file'); @@ -378,6 +391,7 @@ class webhookModel extends model } } } + return $data; } diff --git a/module/webhook/view/browse.html.php b/module/webhook/view/browse.html.php index f5fdc90f0d..e92b037378 100644 --- a/module/webhook/view/browse.html.php +++ b/module/webhook/view/browse.html.php @@ -12,23 +12,23 @@ ?> webhook->confirmDelete);?> -
      - recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?> + recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?> + - $webhook):?> - + + - +
      webhook->id);?>webhook->type);?> webhook->name);?> webhook->url);?> actions;?>
      webhook->typeList, $webhook->type);?> name;?> url;?> @@ -47,7 +47,7 @@
      show();?>show();?>
      diff --git a/module/webhook/view/create.html.php b/module/webhook/view/create.html.php index 6b59be8c1f..26ac4170bd 100644 --- a/module/webhook/view/create.html.php +++ b/module/webhook/view/create.html.php @@ -12,6 +12,7 @@ ?> +webhook->note->typeList);?>
      @@ -22,27 +23,30 @@ - - + + + + + + + - + - - + - + - @@ -53,12 +57,10 @@ - - + - - + type != 'dingding'):?> @@ -53,7 +53,7 @@ - type != 'dingding'):?> + type,") === false):?> diff --git a/module/webhook/view/header.html.php b/module/webhook/view/header.html.php index 5b91ff244b..d4a60744ea 100644 --- a/module/webhook/view/header.html.php +++ b/module/webhook/view/header.html.php @@ -15,16 +15,14 @@
        "; common::printLink('entry', 'browse', '', $lang->webhook->entry); echo ''; - echo "
      • "; common::printLink('webhook', 'browse', 'type=default', $lang->webhook->common); echo '
        • '; - echo "
      • "; common::printLink('webhook', 'browse', 'type=dingding', $lang->webhook->dingding); echo '
        • '; + echo "
      • "; common::printLink('webhook', 'browse', '', $lang->webhook->common); echo '
        • '; ?>
      - +
      - diff --git a/module/webhook/view/log.html.php b/module/webhook/view/log.html.php index 755aef4c62..80d97f821e 100644 --- a/module/webhook/view/log.html.php +++ b/module/webhook/view/log.html.php @@ -13,7 +13,7 @@
      - type}"), $webhook->type == 'dingding' ? $lang->webhook->dingding : $lang->webhook->common);?> + webhook->common);?> name;?> webhook->log;?>
      From 09b7b0c0d2e5e363daf3abebaff308fe12ed1133 Mon Sep 17 00:00:00 2001 From: liugang Date: Mon, 30 Oct 2017 14:37:29 +0800 Subject: [PATCH 4/6] * Adjust style. --- module/project/config.php | 57 ++++++++++++++------------- module/project/view/activate.html.php | 6 +-- module/project/view/close.html.php | 5 +-- module/project/view/start.html.php | 7 ++-- module/project/view/suspend.html.php | 5 +-- 5 files changed, 40 insertions(+), 40 deletions(-) diff --git a/module/project/config.php b/module/project/config.php index 1af2a0f2c9..27288cdde1 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -26,6 +26,7 @@ $config->project->editor->edit = array('id' => 'desc', 'tools' => 'simple $config->project->editor->putoff = array('id' => 'comment', 'tools' => 'simpleTools'); $config->project->editor->activate = array('id' => 'comment', 'tools' => 'simpleTools'); $config->project->editor->close = array('id' => 'comment', 'tools' => 'simpleTools'); +$config->project->editor->start = array('id' => 'comment', 'tools' => 'simpleTools'); $config->project->editor->suspend = array('id' => 'comment', 'tools' => 'simpleTools'); $config->project->search['module'] = 'task'; @@ -63,38 +64,38 @@ $config->project->search['fields']['closedDate'] = $lang->task->closedDate; $config->project->search['fields']['canceledDate'] = $lang->task->canceledDate; $config->project->search['fields']['lastEditedDate'] = $lang->task->lastEditedDate; -$config->project->search['params']['name'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); -$config->project->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->task->statusList); -$config->project->search['params']['desc'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); -$config->project->search['params']['assignedTo'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); -$config->project->search['params']['pri'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->task->priList); +$config->project->search['params']['name'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); +$config->project->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->task->statusList); +$config->project->search['params']['desc'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); +$config->project->search['params']['assignedTo'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); +$config->project->search['params']['pri'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->task->priList); -$config->project->search['params']['project'] = array('operator' => '=', 'control' => 'select', 'values' => ''); -$config->project->search['params']['module'] = array('operator' => 'belong', 'control' => 'select', 'values' => ''); -$config->project->search['params']['estimate'] = array('operator' => '=', 'control' => 'input', 'values' => ''); -$config->project->search['params']['left'] = array('operator' => '=', 'control' => 'input', 'values' => ''); -$config->project->search['params']['consumed'] = array('operator' => '=', 'control' => 'input', 'values' => ''); -$config->project->search['params']['type'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->task->typeList); -$config->project->search['params']['fromBug'] = array('operator' => '=', 'control' => 'input', 'values' => $lang->task->typeList); -$config->project->search['params']['closedReason'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->task->reasonList); +$config->project->search['params']['project'] = array('operator' => '=', 'control' => 'select', 'values' => ''); +$config->project->search['params']['module'] = array('operator' => 'belong', 'control' => 'select', 'values' => ''); +$config->project->search['params']['estimate'] = array('operator' => '=', 'control' => 'input', 'values' => ''); +$config->project->search['params']['left'] = array('operator' => '=', 'control' => 'input', 'values' => ''); +$config->project->search['params']['consumed'] = array('operator' => '=', 'control' => 'input', 'values' => ''); +$config->project->search['params']['type'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->task->typeList); +$config->project->search['params']['fromBug'] = array('operator' => '=', 'control' => 'input', 'values' => $lang->task->typeList); +$config->project->search['params']['closedReason'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->task->reasonList); -$config->project->search['params']['openedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); -$config->project->search['params']['finishedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); -$config->project->search['params']['closedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); -$config->project->search['params']['cancelBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); -$config->project->search['params']['lastEditedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); +$config->project->search['params']['openedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); +$config->project->search['params']['finishedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); +$config->project->search['params']['closedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); +$config->project->search['params']['cancelBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); +$config->project->search['params']['lastEditedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); -$config->project->search['params']['mailto'] = array('operator' => 'include', 'control' => 'select', 'values' => 'users'); +$config->project->search['params']['mailto'] = array('operator' => 'include', 'control' => 'select', 'values' => 'users'); -$config->project->search['params']['openedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); -$config->project->search['params']['deadline'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); -$config->project->search['params']['estStarted'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); -$config->project->search['params']['realStarted'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); -$config->project->search['params']['assignedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); -$config->project->search['params']['finishedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); -$config->project->search['params']['closedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); -$config->project->search['params']['canceledDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); -$config->project->search['params']['lastEditedDate']= array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); +$config->project->search['params']['openedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); +$config->project->search['params']['deadline'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); +$config->project->search['params']['estStarted'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); +$config->project->search['params']['realStarted'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); +$config->project->search['params']['assignedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); +$config->project->search['params']['finishedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); +$config->project->search['params']['closedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); +$config->project->search['params']['canceledDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); +$config->project->search['params']['lastEditedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); $config->printKanban = new stdClass(); $config->printKanban->col['story'] = 1; diff --git a/module/project/view/activate.html.php b/module/project/view/activate.html.php index 59a7fd7b46..ba62c720ac 100644 --- a/module/project/view/activate.html.php +++ b/module/project/view/activate.html.php @@ -11,7 +11,6 @@ */ ?> -
      @@ -25,11 +24,12 @@
      webhook->name;?>webhook->type;?>webhook->typeList, 'default', "class='form-control'");?>
      webhook->name;?>
      webhook->url;?> webhook->note->dingding;?>webhook->note->typeList['default'];?>
      webhook->contentType;?> webhook->contentTypes, '', "class='form-control'");?>
      webhook->sendType;?> webhook->sendTypeList, '', "class='form-control'");?> webhook->note->async;?>
      webhook->product;?> webhook->note->project;?>
      webhook->params;?> webhook->paramsList, 'text');?>
      webhook->action;?> diff --git a/module/webhook/view/edit.html.php b/module/webhook/view/edit.html.php index 8bc8f6b46b..f0ec311465 100644 --- a/module/webhook/view/edit.html.php +++ b/module/webhook/view/edit.html.php @@ -29,7 +29,7 @@
      webhook->url;?> url, "class='form-control'");?>type == 'dingding') echo $lang->webhook->note->dingding;?>webhook->note->typeList, $webhook->type);?>
      projects, "class='form-control chosen' multiple");?> webhook->note->project;?>
      webhook->params;?> webhook->paramsList, $webhook->params);?>
      - + - + +
      comment;?>comment;?>
      goback, $this->session->taskList); ?>goback, $this->session->taskList); ?>
      diff --git a/module/project/view/close.html.php b/module/project/view/close.html.php index 950aa14be8..ad9351e6a3 100644 --- a/module/project/view/close.html.php +++ b/module/project/view/close.html.php @@ -24,12 +24,11 @@ - - - + +
      comment;?>
      goback, $this->session->taskList); ?>goback, $this->session->taskList); ?>
      diff --git a/module/project/view/start.html.php b/module/project/view/start.html.php index af8c20bf31..2cd4b88667 100644 --- a/module/project/view/start.html.php +++ b/module/project/view/start.html.php @@ -11,7 +11,7 @@ */ ?> - +
      @@ -23,11 +23,12 @@
      - + - + +
      comment;?>comment;?>
      project->start) . html::linkButton($lang->goback, $this->session->taskList); ?>project->start) . html::linkButton($lang->goback, $this->session->taskList); ?>
      diff --git a/module/project/view/suspend.html.php b/module/project/view/suspend.html.php index c56a17dfc5..70be041044 100644 --- a/module/project/view/suspend.html.php +++ b/module/project/view/suspend.html.php @@ -24,12 +24,11 @@ - - - + +
      comment;?>
      goback, $this->session->taskList); ?>goback, $this->session->taskList); ?>
      From fd3553901440ca395a528a08a12af47f2301c43b Mon Sep 17 00:00:00 2001 From: liugang Date: Mon, 30 Oct 2017 16:01:03 +0800 Subject: [PATCH 5/6] * @someone in message of dingding when assign an object. --- module/webhook/model.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/module/webhook/model.php b/module/webhook/model.php index a2d13954a6..7b99c75124 100644 --- a/module/webhook/model.php +++ b/module/webhook/model.php @@ -334,25 +334,23 @@ class webhookModel extends model */ public function getDingdingData($title, $text, $mobile) { + if($mobile) $text .= " @{$mobile}"; + $markdown = new stdclass(); $markdown->title = $title; $markdown->text = $text; $data = new stdclass(); + $data->msgtype = 'markdown'; + $data->markdown = $markdown; + if($mobile) { $at = new stdclass(); $at->atMobiles = array($mobile); $at->isAtAll = false; - $data->msgtype = 'text'; - $data->text = array('content' => $text); - $data->at = $at; - } - else - { - $data->msgtype = 'markdown'; - $data->markdown = $markdown; + $data->at = $at; } return $data; From 6dd215423325166bf22538fdd0dc1daa3f847670 Mon Sep 17 00:00:00 2001 From: liugang Date: Mon, 30 Oct 2017 17:55:55 +0800 Subject: [PATCH 6/6] * Add category to product. --- db/update9.5.1.sql | 2 + module/common/lang/en.php | 29 +++++------ module/common/lang/menuOrder.php | 1 + module/common/lang/zh-cn.php | 30 +++++------ module/product/control.php | 2 + module/product/lang/zh-cn.php | 1 + module/product/view/create.html.php | 4 ++ module/product/view/edit.html.php | 4 ++ module/tree/control.php | 21 +++++++- module/tree/lang/zh-cn.php | 78 +++++++++++++++-------------- module/tree/model.php | 8 +++ module/tree/view/browse.html.php | 17 +++++-- 12 files changed, 125 insertions(+), 72 deletions(-) diff --git a/db/update9.5.1.sql b/db/update9.5.1.sql index 7223eb3bf6..b29b3e8679 100644 --- a/db/update9.5.1.sql +++ b/db/update9.5.1.sql @@ -64,6 +64,8 @@ CREATE TABLE IF NOT EXISTS `zt_log` ( KEY `obejctID` (`objectID`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +ALTER TABLE `zt_product` ADD `category` mediumint(8) NOT NULL AFTER `code`; + ALTER TABLE `zt_task` ADD `parent` INT(11) NULL DEFAULT '0' AFTER `deleted`; ALTER TABLE `zt_team` ADD `task` INT(11) NULL DEFAULT '0' AFTER `project`; ALTER TABLE `zt_team` ADD `estimate` DECIMAL(12,2) UNSIGNED NOT NULL DEFAULT '0'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index a9a47cbd8e..3de4a704e0 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -187,20 +187,21 @@ $lang->score->menu = $lang->my->menu; $lang->product = new stdclass(); $lang->product->menu = new stdclass(); -$lang->product->menu->list = array('link' => '%s', 'fixed' => true); -$lang->product->menu->story = array('link' => 'Story|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story'); -$lang->product->menu->dynamic = 'Dynamic|product|dynamic|productID=%s'; -$lang->product->menu->plan = array('link' => 'Plan|productplan|browse|productID=%s', 'subModule' => 'productplan'); -$lang->product->menu->release = array('link' => 'Release|release|browse|productID=%s', 'subModule' => 'release'); -$lang->product->menu->roadmap = 'Roadmap|product|roadmap|productID=%s'; -$lang->product->menu->doc = array('link' => 'Document|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc'); -$lang->product->menu->branch = '@branch@|branch|manage|productID=%s'; -$lang->product->menu->module = 'Module|tree|browse|productID=%s&view=story'; -$lang->product->menu->view = array('link' => 'Overview|product|view|productID=%s', 'alias' => 'edit'); -$lang->product->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s"; -$lang->product->menu->create = array('link' => " Add{$lang->productCommon}|product|create", 'float' => 'right'); -$lang->product->menu->all = array('link' => " All{$lang->productCommon}|product|all|productID=%s", 'float' => 'right'); -$lang->product->menu->index = array('link' => "{$lang->productCommon}Homepage|product|index|locate=no", 'float' => 'right'); +$lang->product->menu->list = array('link' => '%s', 'fixed' => true); +$lang->product->menu->story = array('link' => 'Story|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story'); +$lang->product->menu->dynamic = 'Dynamic|product|dynamic|productID=%s'; +$lang->product->menu->plan = array('link' => 'Plan|productplan|browse|productID=%s', 'subModule' => 'productplan'); +$lang->product->menu->release = array('link' => 'Release|release|browse|productID=%s', 'subModule' => 'release'); +$lang->product->menu->roadmap = 'Roadmap|product|roadmap|productID=%s'; +$lang->product->menu->doc = array('link' => 'Document|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc'); +$lang->product->menu->branch = '@branch@|branch|manage|productID=%s'; +$lang->product->menu->module = 'Module|tree|browse|productID=%s&view=story'; +$lang->product->menu->category = 'Category|tree|browse|productID=%s&view=category'; +$lang->product->menu->view = array('link' => 'Overview|product|view|productID=%s', 'alias' => 'edit'); +$lang->product->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s"; +$lang->product->menu->create = array('link' => " Add{$lang->productCommon}|product|create", 'float' => 'right'); +$lang->product->menu->all = array('link' => " All{$lang->productCommon}|product|all|productID=%s", 'float' => 'right'); +$lang->product->menu->index = array('link' => "{$lang->productCommon}Homepage|product|index|locate=no", 'float' => 'right'); $lang->story = new stdclass(); $lang->productplan = new stdclass(); diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php index 03dd92422e..46975fc04f 100644 --- a/module/common/lang/menuOrder.php +++ b/module/common/lang/menuOrder.php @@ -40,6 +40,7 @@ $lang->product->menuOrder[40] = 'doc'; $lang->product->menuOrder[45] = 'project'; $lang->product->menuOrder[50] = 'branch'; $lang->product->menuOrder[55] = 'module'; +$lang->product->menuOrder[57] = 'category'; $lang->product->menuOrder[60] = 'view'; $lang->product->menuOrder[65] = 'create'; $lang->product->menuOrder[70] = 'all'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index c5c51831e8..81c8b2c620 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -187,20 +187,21 @@ $lang->score->menu = $lang->my->menu; $lang->product = new stdclass(); $lang->product->menu = new stdclass(); -$lang->product->menu->list = array('link' => '%s', 'fixed' => true); -$lang->product->menu->story = array('link' => '需求|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story'); -$lang->product->menu->dynamic = '动态|product|dynamic|productID=%s'; -$lang->product->menu->plan = array('link' => '计划|productplan|browse|productID=%s', 'subModule' => 'productplan'); -$lang->product->menu->release = array('link' => '发布|release|browse|productID=%s', 'subModule' => 'release'); -$lang->product->menu->roadmap = '路线图|product|roadmap|productID=%s'; -$lang->product->menu->doc = array('link' => '文档|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc'); -$lang->product->menu->branch = '@branch@|branch|manage|productID=%s'; -$lang->product->menu->module = '模块|tree|browse|productID=%s&view=story'; -$lang->product->menu->view = array('link' => '概况|product|view|productID=%s', 'alias' => 'edit'); -$lang->product->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s"; -$lang->product->menu->create = array('link' => " 添加{$lang->productCommon}|product|create", 'float' => 'right'); -$lang->product->menu->all = array('link' => " 所有{$lang->productCommon}|product|all|productID=%s", 'float' => 'right'); -$lang->product->menu->index = array('link' => "{$lang->productCommon}主页|product|index|locate=no", 'float' => 'right'); +$lang->product->menu->list = array('link' => '%s', 'fixed' => true); +$lang->product->menu->story = array('link' => '需求|product|browse|productID=%s', 'alias' => 'batchedit', 'subModule' => 'story'); +$lang->product->menu->dynamic = '动态|product|dynamic|productID=%s'; +$lang->product->menu->plan = array('link' => '计划|productplan|browse|productID=%s', 'subModule' => 'productplan'); +$lang->product->menu->release = array('link' => '发布|release|browse|productID=%s', 'subModule' => 'release'); +$lang->product->menu->roadmap = '路线图|product|roadmap|productID=%s'; +$lang->product->menu->doc = array('link' => '文档|doc|objectLibs|type=product&objectID=%s&from=product', 'subModule' => 'doc'); +$lang->product->menu->branch = '@branch@|branch|manage|productID=%s'; +$lang->product->menu->module = '模块|tree|browse|productID=%s&view=story'; +$lang->product->menu->category = '目录|tree|browse|productID=%s&view=category'; +$lang->product->menu->view = array('link' => '概况|product|view|productID=%s', 'alias' => 'edit'); +$lang->product->menu->project = "{$lang->projectCommon}|product|project|status=all&productID=%s"; +$lang->product->menu->create = array('link' => " 添加{$lang->productCommon}|product|create", 'float' => 'right'); +$lang->product->menu->all = array('link' => " 所有{$lang->productCommon}|product|all|productID=%s", 'float' => 'right'); +$lang->product->menu->index = array('link' => "{$lang->productCommon}主页|product|index|locate=no", 'float' => 'right'); $lang->story = new stdclass(); $lang->productplan = new stdclass(); @@ -787,6 +788,7 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') unset($lang->product->menu->roadmap); unset($lang->product->menu->doc); unset($lang->product->menu->module); + unset($lang->product->menu->category); unset($lang->product->menu->index); $lang->product->menu->build = array('link' => '版本|product|build', 'subModule' => 'build'); diff --git a/module/product/control.php b/module/product/control.php index 67894978b1..ce91e9174e 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -231,6 +231,7 @@ class product extends control $this->view->poUsers = $this->loadModel('user')->getPairs('nodeleted|pofirst|noclosed'); $this->view->qdUsers = $this->loadModel('user')->getPairs('nodeleted|qdfirst|noclosed'); $this->view->rdUsers = $this->loadModel('user')->getPairs('nodeleted|devfirst|noclosed'); + $this->view->categories = $this->loadModel('tree')->getOptionMenu($rootID = 0, $type = 'category'); unset($this->lang->product->typeList['']); $this->display(); @@ -275,6 +276,7 @@ class product extends control $this->view->poUsers = $this->loadModel('user')->getPairs('nodeleted|pofirst', $product->PO); $this->view->qdUsers = $this->loadModel('user')->getPairs('nodeleted|qdfirst', $product->QD); $this->view->rdUsers = $this->loadModel('user')->getPairs('nodeleted|devfirst', $product->RD); + $this->view->categories = $this->loadModel('tree')->getOptionMenu($rootID = 0, $type = 'category'); unset($this->lang->product->typeList['']); $this->display(); diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index a9e87d8f87..97965e4da6 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -58,6 +58,7 @@ $lang->product->accessDenied = "您无权访问该{$lang->productCommon}"; $lang->product->id = "编号"; $lang->product->name = "{$lang->productCommon}名称"; $lang->product->code = "{$lang->productCommon}代号"; +$lang->product->category = "{$lang->productCommon}目录"; $lang->product->order = '排序'; $lang->product->type = "{$lang->productCommon}类型"; $lang->product->status = '状态'; diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php index a16703b84f..58e942f997 100644 --- a/module/product/view/create.html.php +++ b/module/product/view/create.html.php @@ -30,6 +30,10 @@ product->code;?> + + product->category;?> + + product->PO;?> app->user->account, "class='form-control chosen'");?> diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php index 86bc7a6e05..961b106b03 100644 --- a/module/product/view/edit.html.php +++ b/module/product/view/edit.html.php @@ -31,6 +31,10 @@ product->code;?> code, "class='form-control' autocomplete='off'");?> + + product->category;?> + category, "class='form-control chosen'");?> + product->PO;?> PO, "class='form-control chosen'");?> diff --git a/module/tree/control.php b/module/tree/control.php index 6f76cf21d5..0730e767c0 100644 --- a/module/tree/control.php +++ b/module/tree/control.php @@ -25,7 +25,7 @@ class tree extends control public function browse($rootID, $viewType, $currentModuleID = 0, $branch = 0) { /* According to the type, set the module root and modules. */ - if(strpos('story|bug|case', $viewType) !== false) + if(strpos('story|bug|case|category', $viewType) !== false) { $product = $this->loadModel('product')->getById($rootID); if($product->type != 'normal') @@ -95,7 +95,6 @@ class tree extends control if($this->config->global->flow == 'onlyTest') $this->lang->set('menugroup.tree', 'testcase'); if($this->config->global->flow != 'onlyTest') $this->lang->set('menugroup.tree', 'qa'); - $title = $product->name . $this->lang->colon . $this->lang->tree->manageCase; $position[] = html::a($this->createLink('testcase', 'browse', "product=$rootID"), $product->name); $position[] = $this->lang->tree->manageCase; @@ -123,6 +122,24 @@ class tree extends control $position[] = html::a($this->createLink('doc', 'browse', "libID=$rootID"), $lib->name); $position[] = $this->lang->tree->manageCustomDoc; } + elseif($viewType == 'category') + { + $this->lang->set('menugroup.tree', 'product'); + $this->product->setMenu($this->product->getPairs(), $rootID, $branch, 'category', '', 'category'); + $this->lang->tree->menu = $this->lang->product->menu; + $this->lang->tree->menuOrder = $this->lang->product->menuOrder; + + $products = $this->product->getPairs(); + unset($products[$rootID]); + $currentProduct = key($products); + + $this->view->allProduct = $products; + $this->view->currentProduct = $currentProduct; + $this->view->productModules = $this->tree->getOptionMenu($currentProduct, 'category'); + + $title = $this->lang->product->common . $this->lang->colon . $this->lang->tree->manageCategory; + $position[] = $this->lang->tree->manageCategory; + } $parentModules = $this->tree->getParents($currentModuleID); $this->view->title = $title; diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php index 6fabd33685..cf89418e67 100644 --- a/module/tree/lang/zh-cn.php +++ b/module/tree/lang/zh-cn.php @@ -10,30 +10,32 @@ * @link http://www.zentao.net */ $lang->tree = new stdclass(); -$lang->tree->common = '模块维护'; -$lang->tree->edit = '编辑'; -$lang->tree->delete = '删除模块'; -$lang->tree->browse = '通用模块维护'; -$lang->tree->browseTask = '任务模块维护'; -$lang->tree->manage = '维护模块'; -$lang->tree->fix = '修正数据'; -$lang->tree->manageProduct = "维护{$lang->productCommon}视图模块"; -$lang->tree->manageProject = "维护{$lang->projectCommon}视图模块"; -$lang->tree->manageBug = '维护测试视图模块'; -$lang->tree->manageCase = '维护用例视图模块'; -$lang->tree->manageCaseLib = '维护测试库模块'; -$lang->tree->manageCustomDoc = '维护文档库分类'; -$lang->tree->updateOrder = '更新排序'; -$lang->tree->manageChild = '维护子模块'; -$lang->tree->manageStoryChild = '维护子模块'; -$lang->tree->manageBugChild = '维护Bug子模块'; -$lang->tree->manageCaseChild = '维护用例子模块'; -$lang->tree->manageCaselibChild = '维护测试库子模块'; -$lang->tree->manageTaskChild = "维护{$lang->projectCommon}子模块"; -$lang->tree->syncFromProduct = '复制'; -$lang->tree->dragAndSort = "拖放排序"; -$lang->tree->sort = "排序"; -$lang->tree->addChild = "增加子模块"; +$lang->tree->common = '模块维护'; +$lang->tree->edit = '编辑'; +$lang->tree->delete = '删除模块'; +$lang->tree->browse = '通用模块维护'; +$lang->tree->browseTask = '任务模块维护'; +$lang->tree->manage = '维护模块'; +$lang->tree->fix = '修正数据'; +$lang->tree->manageProduct = "维护{$lang->productCommon}视图模块"; +$lang->tree->manageProject = "维护{$lang->projectCommon}视图模块"; +$lang->tree->manageCategory = '维护目录'; +$lang->tree->manageBug = '维护测试视图模块'; +$lang->tree->manageCase = '维护用例视图模块'; +$lang->tree->manageCaseLib = '维护测试库模块'; +$lang->tree->manageCustomDoc = '维护文档库分类'; +$lang->tree->updateOrder = '更新排序'; +$lang->tree->manageChild = '维护子模块'; +$lang->tree->manageStoryChild = '维护子模块'; +$lang->tree->manageCategoryChild = '维护子目录'; +$lang->tree->manageBugChild = '维护Bug子模块'; +$lang->tree->manageCaseChild = '维护用例子模块'; +$lang->tree->manageCaselibChild = '维护测试库子模块'; +$lang->tree->manageTaskChild = "维护{$lang->projectCommon}子模块"; +$lang->tree->syncFromProduct = '复制'; +$lang->tree->dragAndSort = "拖放排序"; +$lang->tree->sort = "排序"; +$lang->tree->addChild = "增加子模块"; $lang->tree->confirmDelete = '该模块及其子模块都会被删除，您确定删除吗？'; $lang->tree->confirmRoot = "模块的所属{$lang->productCommon}修改，会关联修改该模块下的需求、Bug、用例的所属{$lang->productCommon}，以及{$lang->projectCommon}和{$lang->productCommon}的关联关系。该操作比较危险，请谨慎操作。是否确认修改？"; @@ -41,16 +43,18 @@ $lang->tree->successSave = '成功保存'; $lang->tree->successFixed = '成功修正数据！'; $lang->tree->repeatName = '模块名“%s”已经存在！'; -$lang->tree->name = '模块名称'; -$lang->tree->root = '所属根'; -$lang->tree->branch = '平台/分支'; -$lang->tree->path = '路径'; -$lang->tree->type = '类型'; -$lang->tree->parent = '上级模块'; -$lang->tree->child = '子模块'; -$lang->tree->owner = '负责人'; -$lang->tree->order = '排序'; -$lang->tree->short = '简称'; -$lang->tree->all = '所有模块'; -$lang->tree->projectDoc = "{$lang->projectCommon}文档"; -$lang->tree->product = "所属{$lang->productCommon}"; +$lang->tree->name = '模块名称'; +$lang->tree->category = '目录名称'; +$lang->tree->root = '所属根'; +$lang->tree->branch = '平台/分支'; +$lang->tree->path = '路径'; +$lang->tree->type = '类型'; +$lang->tree->parent = '上级模块'; +$lang->tree->child = '子模块'; +$lang->tree->categoryChild = '子目录'; +$lang->tree->owner = '负责人'; +$lang->tree->order = '排序'; +$lang->tree->short = '简称'; +$lang->tree->all = '所有模块'; +$lang->tree->projectDoc = "{$lang->projectCommon}文档"; +$lang->tree->product = "所属{$lang->productCommon}"; diff --git a/module/tree/model.php b/module/tree/model.php index 669cf08aca..4944937fc7 100644 --- a/module/tree/model.php +++ b/module/tree/model.php @@ -81,6 +81,8 @@ class treeModel extends model */ public function getOptionMenu($rootID, $type = 'story', $startModule = 0, $branch = 0) { + if($type == 'category') $rootID = 0; + $branches = array($branch => ''); if(strpos('story|bug|case', $type) !== false) { @@ -312,6 +314,8 @@ class treeModel extends model */ public function getTreeMenu($rootID, $type = 'root', $startModule = 0, $userFunc, $extra = '', $branch = 0) { + if($type == 'category') $rootID = 0; + $branches = array($branch => ''); if($branch) { @@ -945,6 +949,8 @@ class treeModel extends model */ public function getSons($rootID, $moduleID, $type = 'root', $branch = 0) { + if($type == 'category') $rootID = 0; + /* if createVersion <= 4.1 or type == 'story', only get modules of its type. */ if(!$this->isMergeModule($rootID, $type) or $type == 'story') { @@ -1495,6 +1501,8 @@ class treeModel extends model */ public function getProductStructure($rootID, $viewType, $branch = 0, $currentModuleID = 0) { + if($viewType == 'category') $rootID = 0; + $branches = array($branch => ''); $product = $this->loadModel('product')->getById($rootID); if(strpos('story|bug|case', $viewType) !== false and empty($branch)) diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php index ddc7c09906..0a71eccc18 100644 --- a/module/tree/view/browse.html.php +++ b/module/tree/view/browse.html.php @@ -12,8 +12,9 @@ ?> type != 'normal') ? true : false;?> +tree->category : $lang->tree->name;?>
      -
      tree->common;?>
      +
      tree->manageCategory : $lang->tree->common;?>
      @@ -40,6 +41,7 @@
      + + + +
      "; - echo "
      " . html::input("modules[]", '', "class='form-control' placeholder='{$lang->tree->name}' autocomplete='off'") . '
      '; + echo "
      " . html::input("modules[]", '', "class='form-control' placeholder='{$name}' autocomplete='off'") . '
      '; if($hasBranch) echo '
      ' . html::select("branch[]", $branches, $branch, 'class="form-control"') . '
      '; echo "
      " . html::input("shorts[]", '', "class='form-control' placeholder='{$lang->tree->short}' autocomplete='off'"); echo ""; @@ -91,7 +94,7 @@ echo "
      ', - title: 'tree->child ?>', - template: 'tree->child?>' + title: 'tree->categoryChild : $lang->tree->child ?>', + template: 'tree->categoryChild : $lang->tree->child?>' } }, action: function(event) @@ -238,6 +243,8 @@ $(function() }); $tree.find('[data-toggle="tooltip"]').tooltip(); + + $('#modulemenu > .nav > li > a[href*=tree][href*=browse]').not('[href*=]').parent().removeClass('active'); });