From 214dc23e335cfc8a470b0c2c39cc21361019c173 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Mon, 31 Aug 2020 09:30:45 +0800 Subject: [PATCH 01/14] * Adjust page. --- module/design/view/assignto.html.php | 2 +- module/design/view/batchcreate.html.php | 2 +- module/design/view/browse.html.php | 16 ++++++++-------- module/design/view/create.html.php | 2 +- module/design/view/edit.html.php | 10 +++++----- module/design/view/view.html.php | 10 +++++----- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/module/design/view/assignto.html.php b/module/design/view/assignto.html.php index 8f5102063a..8c3dc4f8de 100644 --- a/module/design/view/assignto.html.php +++ b/module/design/view/assignto.html.php @@ -2,7 +2,7 @@ /** * The assign of design module of ZenTaoPMS. * - * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) + * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) * @license ZPL (http://zpl.pub/page/zplv12.html) * @author Chunsheng Wang * @package design diff --git a/module/design/view/batchcreate.html.php b/module/design/view/batchcreate.html.php index 3e32f89825..e48ff87e88 100644 --- a/module/design/view/batchcreate.html.php +++ b/module/design/view/batchcreate.html.php @@ -2,7 +2,7 @@ /** * The batchCreate view of design module of ZenTaoPMS. * - * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) + * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) * @license ZPL (http://zpl.pub/page/zplv12.html) * @author Chunsheng Wang * @package design diff --git a/module/design/view/browse.html.php b/module/design/view/browse.html.php index f4416512e6..ba4ad2968f 100644 --- a/module/design/view/browse.html.php +++ b/module/design/view/browse.html.php @@ -49,19 +49,19 @@ design->createdBy);?> design->createdDate);?> design->assignedTo);?> - design->actions;?> + design->actions;?> - id);?> - design->typeList, $design->type);?> - createLink('design', 'view', "id={$design->id}"), $design->name);?> - commit;?> - createdBy;?> - createdDate, 0, 11);?> - design->printAssignedHtml($design, $users);?> + id);?> + design->typeList, $design->type);?> + createLink('design', 'view', "id={$design->id}"), $design->name);?> + commit;?> + createdBy;?> + createdDate, 0, 11);?> + design->printAssignedHtml($design, $users);?> id}"; diff --git a/module/design/view/create.html.php b/module/design/view/create.html.php index a82134215e..54bec96108 100644 --- a/module/design/view/create.html.php +++ b/module/design/view/create.html.php @@ -2,7 +2,7 @@ /** * The create view of design module of ZenTaoPMS. * - * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) + * @copyright Copyright 2009-2020 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) * @license ZPL (http://zpl.pub/page/zplv12.html) * @author Chunsheng Wang * @package design diff --git a/module/design/view/edit.html.php b/module/design/view/edit.html.php index eb51b8dd5e..11f86f7774 100644 --- a/module/design/view/edit.html.php +++ b/module/design/view/edit.html.php @@ -62,12 +62,12 @@ - - - + + + - - + + diff --git a/module/design/view/view.html.php b/module/design/view/view.html.php index 044a661427..c45379b077 100644 --- a/module/design/view/view.html.php +++ b/module/design/view/view.html.php @@ -39,10 +39,10 @@ ";?> deleted):?> id", $design, 'button', '', '', 'iframe showinonlybody', true); - common::printIcon('design', 'commit', "designID=$design->id", $design, 'button', 'link', '', 'iframe showinonlybody', true); - common::printIcon('design', 'edit', "designID=$design->id", $design, 'button', 'fork', '', '', true); - common::printIcon('design', 'delete', "designID=$design->id", $design, 'button', 'trash', 'hiddenwin'); + common::printIcon('design', 'assignTo', "designID=$design->id", $design, 'button', '', '', 'iframe showinonlybody', true); + common::printIcon('design', 'linkCommit', "designID=$design->id", $design, 'button', 'link', '', 'iframe showinonlybody', true); + common::printIcon('design', 'edit', "designID=$design->id", $design, 'button', 'fork', '', '', true); + common::printIcon('design', 'delete', "designID=$design->id", $design, 'button', 'trash', 'hiddenwin'); ?> @@ -67,7 +67,7 @@ - + From ec4afb786313b41d3e5c5b67c8dc1ec5ba3b8516 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Mon, 31 Aug 2020 09:46:42 +0800 Subject: [PATCH 02/14] *Finish task #7770. --- module/group/lang/resource.php | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 66b62eb3c3..ab2354e8e0 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -16,14 +16,10 @@ $lang->moduleOrder[5] = 'my'; $lang->moduleOrder[10] = 'todo'; $lang->moduleOrder[11] = 'program'; -$lang->moduleOrder[12] = 'design'; -$lang->moduleOrder[13] = 'programplan'; $lang->moduleOrder[15] = 'product'; $lang->moduleOrder[20] = 'story'; $lang->moduleOrder[25] = 'productplan'; $lang->moduleOrder[30] = 'release'; -$lang->moduleOrder[31] = 'issue'; -$lang->moduleOrder[32] = 'risk'; $lang->moduleOrder[35] = 'project'; $lang->moduleOrder[40] = 'task'; @@ -39,20 +35,14 @@ $lang->moduleOrder[80] = 'caselib'; $lang->moduleOrder[85] = 'doc'; $lang->moduleOrder[90] = 'report'; -$lang->moduleOrder[91] = 'workestimation'; -$lang->moduleOrder[92] = 'durationestimation'; -$lang->moduleOrder[93] = 'budget'; $lang->moduleOrder[95] = 'company'; -$lang->moduleOrder[97] = 'stage'; $lang->moduleOrder[100] = 'dept'; $lang->moduleOrder[105] = 'group'; $lang->moduleOrder[110] = 'user'; $lang->moduleOrder[115] = 'admin'; $lang->moduleOrder[120] = 'extension'; -$lang->moduleOrder[121] = 'subject'; -$lang->moduleOrder[122] = 'holiday'; $lang->moduleOrder[125] = 'custom'; $lang->moduleOrder[140] = 'action'; @@ -69,6 +59,19 @@ $lang->moduleOrder[190] = 'cron'; $lang->moduleOrder[195] = 'dev'; $lang->moduleOrder[200] = 'message'; +$lang->moduleOrder[205] = 'design'; +$lang->moduleOrder[210] = 'programplan'; +$lang->moduleOrder[215] = 'issue'; +$lang->moduleOrder[220] = 'risk'; +$lang->moduleOrder[225] = 'stage'; + +$lang->moduleOrder[230] = 'budget'; +$lang->moduleOrder[235] = 'workestimation'; +$lang->moduleOrder[240] = 'durationestimation'; + +$lang->moduleOrder[245] = 'subject'; +$lang->moduleOrder[250] = 'holiday'; + $lang->resource = new stdclass(); /* Index module. */ From d9dba4768eb9d0e7d95d714ea3b39f3ef20d93a3 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Mon, 31 Aug 2020 10:02:28 +0800 Subject: [PATCH 03/14] * Finish task#7742. --- module/issue/control.php | 48 ++++++++++++------------- module/issue/lang/en.php | 2 +- module/issue/lang/zh-cn.php | 2 +- module/issue/model.php | 72 ++++++++++++++++++------------------- 4 files changed, 62 insertions(+), 62 deletions(-) diff --git a/module/issue/control.php b/module/issue/control.php index 9b4bec3063..2e9e5a8e35 100644 --- a/module/issue/control.php +++ b/module/issue/control.php @@ -4,9 +4,9 @@ * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) * @license ZPL (http://zpl.pub/page/zplv12.html) - * @author Chunsheng Wang + * @author Yong Lei * @package issue - * @version $Id: control.php 5145 2013-07-15 06:47:26Z chencongzhi520@gmail.com $ + * @version $Id$ * @link http://www.zentao.net */ class issue extends control @@ -14,7 +14,7 @@ class issue extends control /** * Get issue list data. * - * @param string $browseType + * @param string $browseType bySearch|open|assignTo|closed|suspended|canceled * @param int param * @param string orderBy * @param int recTotal @@ -43,14 +43,14 @@ class issue extends control $this->view->param = $param; $this->view->orderBy = $orderBy; $this->view->browseType = $browseType; - $this->view->issueList = $this->issue->getIssueList($browseType, $queryID, $orderBy, $pager); + $this->view->issueList = $this->issue->getList($browseType, $queryID, $orderBy, $pager); $this->view->users = $this->loadModel('user')->getPairs('noletter|pofirst|nodeleted'); $this->display(); } /** - * Create a issue. + * Create an issue. * * @access public * @return void @@ -251,61 +251,61 @@ class issue extends control } /** - * Resolve a issue. + * Resolve an issue. * - * @param int $issue + * @param int $issueID * @access public * @return void */ - public function resolve($issue) + public function resolve($issueID) { if($_POST) { - $this->issue->resolve($issue); + $this->issue->resolve($issueID); $resolution = $this->post->issue['resolution']; $objectID = ''; if($resolution == 'totask') { - $objectID = $this->issue->createTask($issue); + $objectID = $this->issue->createTask($issueID); $objectLink = html::a($this->createLink('task', 'view', "id=$objectID"), $this->post->name, "data-toggle='modal'"); $comment = sprintf($this->lang->issue->logComments[$resolution], $objectLink); $this->loadModel('action')->create('task', $objectID, 'Opened', ''); - $this->loadModel('action')->create('issue', $issue, 'Resolved', $comment); + $this->loadModel('action')->create('issue', $issueID, 'Resolved', $comment); } if($resolution == 'tostory') { - $objectID = $this->issue->createStory($issue); + $objectID = $this->issue->createStory($issueID); $objectLink = html::a($this->createLink('story', 'view', "id=$objectID"), $this->post->title, "data-toggle='modal'"); $comment = sprintf($this->lang->issue->logComments[$resolution], $objectLink); $this->loadModel('action')->create('story', $objectID, 'Opened', ''); - $this->loadModel('action')->create('issue', $issue, 'Resolved', $comment); + $this->loadModel('action')->create('issue', $issueID, 'Resolved', $comment); } if($resolution == 'tobug') { - $objectID = $this->issue->createBug($issue); + $objectID = $this->issue->createBug($issueID); $objectLink = html::a($this->createLink('bug', 'view', "id=$objectID"), $this->post->title, "data-toggle='modal'"); $comment = sprintf($this->lang->issue->logComments[$resolution], $objectLink); $this->loadModel('action')->create('bug', $objectID, 'Opened', ''); - $this->loadModel('action')->create('issue', $issue, 'Resolved', $comment); + $this->loadModel('action')->create('issue', $issueID, 'Resolved', $comment); } if($resolution == 'torisk') { - $objectID = $this->issue->createRisk($issue); + $objectID = $this->issue->createRisk($issueID); $objectLink = html::a($this->createLink('risk', 'view', "id=$objectID"), $this->post->title, "data-toggle='modal'"); $comment = sprintf($this->lang->issue->logComments[$resolution], $objectLink); $this->loadModel('action')->create('risk', $objectID, 'Opened', ''); - $this->loadModel('action')->create('issue', $issue, 'Resolved', $comment); + $this->loadModel('action')->create('issue', $issueID, 'Resolved', $comment); } - $this->dao->update(TABLE_ISSUE)->set('objectID')->eq($objectID)->where('id')->eq($issue)->exec(); + $this->dao->update(TABLE_ISSUE)->set('objectID')->eq($objectID)->where('id')->eq($issueID)->exec(); $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse'))); } $this->view->title = $this->lang->issue->resolve; - $this->view->issue = $this->issue->getByID($issue); + $this->view->issue = $this->issue->getByID($issueID); $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->prepairParams($this->view->issue); @@ -313,7 +313,7 @@ class issue extends control } /** - * prepairParams + * Build page parameters. * * @param int $issue * @access public @@ -368,9 +368,9 @@ class issue extends control $this->view->members = $members; $this->view->moduleOptionMenu = $moduleOptionMenu; - $this->view->projects = $this->loadModel('project')->getPairs(); - $this->view->program = $this->loadModel('project')->getById($this->session->program); - $this->view->products = $this->loadModel('product')->getPairs(); + $this->view->projects = $this->loadModel('project')->getPairs(); + $this->view->program = $this->loadModel('project')->getById($this->session->program); + $this->view->products = $this->loadModel('product')->getPairs(); $this->view->productID = $this->session->product; $this->view->moduleID = 0; $this->view->branch = 0; @@ -401,7 +401,7 @@ class issue extends control } /** - * commonAction + * Common actions of issue module. * * @param int $issueID * @param int $object diff --git a/module/issue/lang/en.php b/module/issue/lang/en.php index b44deb7be8..64d6bf4043 100644 --- a/module/issue/lang/en.php +++ b/module/issue/lang/en.php @@ -57,7 +57,7 @@ $lang->issue->labelList['open'] = 'Open'; $lang->issue->labelList['assignto'] = 'AssignedToMe'; $lang->issue->labelList['closed'] = 'Closed'; $lang->issue->labelList['suspended'] = 'Suspended'; -$lang->issue->labelList['cancelled'] = 'Canceled'; +$lang->issue->labelList['canceled'] = 'Canceled'; $lang->issue->priList[''] = ''; $lang->issue->priList['1'] = 1; diff --git a/module/issue/lang/zh-cn.php b/module/issue/lang/zh-cn.php index 4e2d1cd6b6..5534a3ab76 100644 --- a/module/issue/lang/zh-cn.php +++ b/module/issue/lang/zh-cn.php @@ -57,7 +57,7 @@ $lang->issue->labelList['open'] = '开放'; $lang->issue->labelList['assignto'] = '指派给我'; $lang->issue->labelList['closed'] = '已关闭'; $lang->issue->labelList['suspended'] = '已挂起'; -$lang->issue->labelList['cancelled'] = '已取消'; +$lang->issue->labelList['canceled'] = '已取消'; $lang->issue->priList[''] = ''; $lang->issue->priList['1'] = 1; diff --git a/module/issue/model.php b/module/issue/model.php index 84548c0aa0..50272cc0cc 100644 --- a/module/issue/model.php +++ b/module/issue/model.php @@ -4,41 +4,15 @@ * * @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com) * @license ZPL (http://zpl.pub/page/zplv12.html) - * @author Chunsheng Wang + * @author Yong Lei * @package issue - * @version $Id: model.php 5145 2013-07-15 06:47:26Z chencongzhi520@gmail.com $ + * @version $Id$ * @link http://www.zentao.net */ ?> add('createdBy', $this->app->user->account) - ->add('createdDate', $now) - ->add('program', $this->session->program) - ->remove('labels,files') - ->addIF($this->post->assignedTo, 'assignedBy', $this->app->user->account) - ->addIF($this->post->assignedTo, 'assignedDate', $now) - ->stripTags($this->config->issue->editor->create['id'], $this->config->allowedTags) - ->get(); - - $this->dao->insert(TABLE_ISSUE)->data($data)->batchCheck($this->config->issue->create->requiredFieldsm, 'notempty')->exec(); - $issueID = $this->dao->lastInsertID(); - $this->loadModel('file')->saveUpload('issue', $issueID); - - return $issueID; - } - /** * Get stakeholder issue list data. * @param string $owner @@ -73,16 +47,16 @@ class issueModel extends model } /** - * Get issue list. + * Get issue list data. * - * @param string $browseType + * @param string $browseType bySearch|open|assignTo|closed|suspended|canceled * @param int $queryID * @param string $orderBy * @param object $pager * @access public * @return object */ - public function getIssueList($browseType = 'all', $queryID = 0, $orderBy = 'id_desc', $pager = null) + public function getList($browseType = 'all', $queryID = 0, $orderBy = 'id_desc', $pager = null) { $issueQuery = ''; if($browseType == 'bysearch') @@ -114,9 +88,9 @@ class issueModel extends model } /** - * getBlockIssues + * Get the issue in the block. * - * @param string $browseType + * @param string $browseType open|assignto|closed|suspended|canceled * @param int $limit * @param string $orderBy * @access public @@ -131,7 +105,7 @@ class issueModel extends model ->beginIF($browseType == 'assignto')->andWhere('assignedTo')->eq($this->app->user->account)->fi() ->beginIF($browseType == 'closed')->andWhere('status')->eq('closed')->fi() ->beginIF($browseType == 'suspended')->andWhere('status')->eq('suspended')->fi() - ->beginIF($browseType == 'cancelled')->andWhere('status')->eq('canceled')->fi() + ->beginIF($browseType == 'canceled')->andWhere('status')->eq('canceled')->fi() ->orderBy($orderBy) ->limit($limit) ->fetchAll(); @@ -150,6 +124,32 @@ class issueModel extends model return $this->dao->select('id,name')->from(TABLE_ACTIVITY)->where('deleted')->eq('0')->orderBy('id_desc')->fetchPairs(); } + /** + * Create an issue. + * + * @access public + * @return bool + */ + public function create() + { + $now = helper::now(); + $data = fixer::input('post') + ->add('createdBy', $this->app->user->account) + ->add('createdDate', $now) + ->add('program', $this->session->program) + ->remove('labels,files') + ->addIF($this->post->assignedTo, 'assignedBy', $this->app->user->account) + ->addIF($this->post->assignedTo, 'assignedDate', $now) + ->stripTags($this->config->issue->editor->create['id'], $this->config->allowedTags) + ->get(); + + $this->dao->insert(TABLE_ISSUE)->data($data)->batchCheck($this->config->issue->create->requiredFields, 'notempty')->exec(); + $issueID = $this->dao->lastInsertID(); + $this->loadModel('file')->saveUpload('issue', $issueID); + + return $issueID; + } + /** * Update an issue. * @@ -172,7 +172,7 @@ class issueModel extends model $this->dao->update(TABLE_ISSUE)->data($data) ->where('id')->eq($issueID) - ->batchCreate($this->config->issue->edit->requiredFields, 'notempty') + ->batchCheck($this->config->issue->edit->requiredFields, 'notempty') ->exec(); return common::createChanges($oldIssue, $data); @@ -306,7 +306,7 @@ class issueModel extends model } /** - * Create a task. + * Create an task. * * @access public * @return object From 00241491c2f1d49f8fe1fa428a3864db7fa15d3a Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Mon, 31 Aug 2020 10:14:56 +0800 Subject: [PATCH 04/14] * Same title format. --- module/design/control.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/module/design/control.php b/module/design/control.php index f428c86177..2f7cbb7d52 100644 --- a/module/design/control.php +++ b/module/design/control.php @@ -41,7 +41,7 @@ class design extends control $pager = pager::init($recTotal, $recPerPage, $pageID); $designs = $this->design->getList($productID, $type, $queryID, $orderBy, $pager); - $this->view->title = $this->lang->design->browse; + $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->browse; $this->view->position[] = $this->lang->design->browse; $this->view->designs = $designs; @@ -86,7 +86,7 @@ class design extends control $productID = $this->loadModel('product')->saveState($productID, $this->product->getPairs('nocode')); $this->design->setProductMenu($productID); - $this->view->title = $this->lang->design->create; + $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->create; $this->view->position[] = $this->lang->design->create; $this->view->users = $this->loadModel('user')->getPairs('noclosed'); @@ -125,7 +125,7 @@ class design extends control $this->send($response); } - $this->view->title = $this->lang->design->batchCreate; + $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->batchCreate; $this->view->position[] = $this->lang->design->batchCreate; $this->view->stories = $this->loadModel('story')->getProductStoryPairs($productID); @@ -146,7 +146,7 @@ class design extends control $design = $this->design->getById($designID); $this->design->setProductMenu($design->product); - $this->view->title = $this->lang->design->view; + $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->view; $this->view->position[] = $this->lang->design->view; $this->view->design = $design; @@ -193,7 +193,8 @@ class design extends control $this->send($response); } - $this->view->title = $this->lang->design->edit; + $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->edit; + $this->view->position[] = $this->lang->design->view; $this->view->position[] = $this->lang->design->edit; $this->view->design = $design; @@ -246,7 +247,7 @@ class design extends control $relations = $this->loadModel('common')->getRelations('design', $designID, 'commit'); foreach($relations as $relation) $linkedRevisions[] = $relation->BID; - $this->view->title = $this->lang->design->linkCommit; + $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->linkCommit; $this->view->position[] = $this->lang->design->linkCommit; $this->view->repos = $repos; @@ -323,7 +324,7 @@ class design extends control die(js::locate($this->createLink('design', 'browse'), 'parent')); } - $this->view->title = $this->lang->design->assignedTo; + $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->assignedTo; $this->view->position[] = $this->lang->design->assignedTo; $this->view->design = $this->design->getById($designID); From 56113f328ed54d5378bb7372d1d22e88c5d8be78 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Mon, 31 Aug 2020 10:32:48 +0800 Subject: [PATCH 05/14] * Finish task#7748. --- db/zentao.sql | 59 --------------------------------------------------- 1 file changed, 59 deletions(-) diff --git a/db/zentao.sql b/db/zentao.sql index 45b0a4fbbe..9a4a051bc3 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -1390,65 +1390,6 @@ CREATE TABLE IF NOT EXISTS `zt_relation` ( `extra` char(30) NOT NULL, UNIQUE KEY `relation` (`relation`,`AType`,`BType`, `AID`, `BID`) ) ENGINE='MyISAM' DEFAULT CHARSET=utf8; - --- DROP TABLE IF EXISTS `zt_repo`; -CREATE TABLE IF NOT EXISTS `zt_repo` ( - `id` mediumint(9) NOT NULL AUTO_INCREMENT, - `program` mediumint(8) unsigned NOT NULL, - `name` varchar(255) NOT NULL, - `path` varchar(255) NOT NULL, - `prefix` varchar(100) NOT NULL, - `encoding` varchar(20) NOT NULL, - `SCM` varchar(10) NOT NULL, - `client` varchar(100) NOT NULL, - `commits` mediumint(8) unsigned NOT NULL, - `account` varchar(30) NOT NULL, - `password` varchar(30) NOT NULL, - `encrypt` varchar(30) NOT NULL DEFAULT 'plain', - `acl` text NOT NULL, - `synced` tinyint(1) NOT NULL DEFAULT '0', - `lastSync` datetime NOT NULL, - `desc` TEXT NULL, - `deleted` tinyint(1) NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - --- DROP TABLE IF EXISTS `zt_repobranch`; -CREATE TABLE IF NOT EXISTS `zt_repobranch` ( - `repo` mediumint(8) unsigned NOT NULL, - `revision` mediumint(8) unsigned NOT NULL, - `branch` varchar(255) NOT NULL, - UNIQUE KEY `repo_revision_branch` (`repo`,`revision`,`branch`), - KEY `branch` (`branch`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - --- DROP TABLE IF EXISTS `zt_repohistory`; -CREATE TABLE IF NOT EXISTS `zt_repohistory` ( - `id` mediumint(9) NOT NULL AUTO_INCREMENT, - `repo` mediumint(9) NOT NULL, - `revision` varchar(40) NOT NULL, - `commit` mediumint(8) unsigned NOT NULL, - `comment` text NOT NULL, - `committer` varchar(100) NOT NULL, - `time` datetime NOT NULL, - PRIMARY KEY (`id`), - KEY `repo` (`repo`,`revision`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - --- DROP TABLE IF EXISTS `zt_repofiles`; -CREATE TABLE IF NOT EXISTS `zt_repofiles` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `repo` mediumint(8) unsigned NOT NULL, - `revision` mediumint(8) unsigned NOT NULL, - `path` varchar(255) NOT NULL, - `parent` varchar(255) NOT NULL, - `type` varchar(20) NOT NULL, - `action` char(1) NOT NULL, - PRIMARY KEY (`id`), - KEY `path` (`path`), - KEY `parent` (`parent`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`, `lastTime`) VALUES ('*', '*', '*', '*', '*', '', '监控定时任务', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), ('30', '23', '*', '*', '*', 'moduleName=project&methodName=computeburn', '更新燃尽图', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), From e2adfa9152496359c58087713de075aa61fd0c9e Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Mon, 31 Aug 2020 11:30:05 +0800 Subject: [PATCH 06/14] * Finish task#7718. --- module/block/lang/zh-cn.php | 3 ++- module/block/view/cmmiganttblock.html.php | 13 ++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 75ea891da2..efd512ccb8 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -62,6 +62,7 @@ $lang->block->consumedHours = '已消耗'; $lang->block->time = '第'; $lang->block->week = '周'; $lang->block->month = '月'; +$lang->block->selectProduct = '选择产品'; $lang->block->params = new stdclass(); $lang->block->params->name = '参数名称'; @@ -103,7 +104,7 @@ $lang->block->default['cmmi']['program']['2']['block'] = 'cmmiestimate'; $lang->block->default['cmmi']['program']['2']['source'] = 'program'; $lang->block->default['cmmi']['program']['2']['grid'] = 4; -$lang->block->default['cmmi']['program']['3']['title'] = '计划甘特图'; +$lang->block->default['cmmi']['program']['3']['title'] = '项目计划'; $lang->block->default['cmmi']['program']['3']['block'] = 'cmmigantt'; $lang->block->default['cmmi']['program']['3']['source'] = 'program'; $lang->block->default['cmmi']['program']['3']['grid'] = 8; diff --git a/module/block/view/cmmiganttblock.html.php b/module/block/view/cmmiganttblock.html.php index e8095fd715..a16cfbd7a6 100644 --- a/module/block/view/cmmiganttblock.html.php +++ b/module/block/view/cmmiganttblock.html.php @@ -1,7 +1,8 @@
= 2): ?> - + + * block->selectProduct;?>
programplan->noData;?>
@@ -10,19 +11,22 @@
-
programplan->today; ?>
+
programplan->today; ?>
+
task->id;?>task->name;?>task->assignedTo;?> task->id;?> task->name;?> task->assignedTo;?> task->status;?>task->consumed;?>task->left;?> task->consumed;?> task->left;?>
story ? html::a($this->createLink('story', 'view', "id=$design->story"), zget($stories, $design->story)) : '';?>
design->commit;?>design->submission;?> commit;?>
diff --git a/module/common/model.php b/module/common/model.php index 08aa139576..c0d0fab7c6 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -189,6 +189,9 @@ class commonModel extends model /** * Deny access. * + * @param varchar $module + * @param varchar $method + * @param bool $reload * @access public * @return mixed */ diff --git a/module/custom/control.php b/module/custom/control.php index ebc3f740a2..4004f4ae0e 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -348,7 +348,7 @@ class custom extends control } /** - * Company estimate. + * Init company estimate unit. * * @access public * @return void @@ -359,12 +359,13 @@ class custom extends control $this->lang->navGroup->custom = 'system'; if(strtolower($this->server->request_method) == "post") { + $this->loadModel('setting'); $data = fixer::input('post')->get(); - $this->loadModel('setting')->setItem('system.custom.hourPoint', $data->hourPoint); - $this->loadModel('setting')->setItem('system.custom.cost', $data->cost); - $this->loadModel('setting')->setItem('system.custom.efficiency', $data->efficiency); - $this->loadModel('setting')->setItem('system.custom.days', $data->days); - $this->loadModel('setting')->setItem('system.project.defaultWorkhours', $data->defaultWorkhours); + $this->setting->setItem('system.custom.hourPoint', $data->hourPoint); + $this->setting->setItem('system.custom.cost', $data->cost); + $this->setting->setItem('system.custom.efficiency', $data->efficiency); + $this->setting->setItem('system.custom.days', $data->days); + $this->setting->setItem('system.project.defaultWorkhours', $data->defaultWorkhours); if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError())); $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('custom', 'estimate'))); diff --git a/module/group/model.php b/module/group/model.php index 85795ce4ec..47b6ec6ab1 100644 --- a/module/group/model.php +++ b/module/group/model.php @@ -480,8 +480,8 @@ class groupModel extends model public function checkMenuModule($menu, $moduleName) { if(empty($menu)) return true; - if($menu == 'other' and (isset($this->lang->menugroup->$moduleName) or isset($this->lang->menu->$moduleName))) return false; - if($menu != 'other' and !($moduleName == $menu or (isset($this->lang->menugroup->$moduleName) and $this->lang->menugroup->$moduleName == $menu))) return false; + if($menu == 'other' and (isset($this->lang->navGroup->$moduleName) or isset($this->lang->mainNav->$moduleName))) return false; + if($menu != 'other' and !($moduleName == $menu or (isset($this->lang->navGroup->$moduleName) and $this->lang->navGroup->$moduleName == $menu))) return false; return true; } diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php index c51d7bb117..bcbfc19731 100644 --- a/module/group/view/privbygroup.html.php +++ b/module/group/view/privbygroup.html.php @@ -53,14 +53,14 @@ {$lang->group->all}", '', "class='btn btn-link $active'")?> - menu as $module => $title):?> - - - " . substr($title, 0, strpos($title, '|')) . '', '', "class='btn btn-link $active'")?> - + mainNav as $module => $title):?> + + + " . substr($title, 0, strpos($title, '|')) . '', '', "class='btn btn-link $active'")?> + - - {$lang->group->other}", '', "class='btn btn-link $active'");?> + + {$lang->group->other}", '', "class='btn btn-link $active'");?>
lang->group->versions, $version, "onchange=showPriv(this.value) class='form-control chosen'");?> diff --git a/module/jenkins/control.php b/module/jenkins/control.php index 2be1edd118..67658f061f 100644 --- a/module/jenkins/control.php +++ b/module/jenkins/control.php @@ -35,7 +35,7 @@ class jenkins extends control */ public function browse($orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { - if(common::hasPriv('jenkins', 'create')) $this->lang->modulePageActions = html::a(helper::createLink('jenkins', 'create', ''), " " . $this->lang->jenkins->create, '', "class='btn btn-primary'"); + if(common::hasPriv('jenkins', 'create')) $this->lang->modulePageActions = html::a(helper::createLink('jenkins', 'create'), " " . $this->lang->jenkins->create, '', "class='btn btn-primary'"); $this->app->loadClass('pager', $static = true); $pager = new pager($recTotal, $recPerPage, $pageID); diff --git a/module/job/view/browse.html.php b/module/job/view/browse.html.php index bf8e750400..c54b21a591 100644 --- a/module/job/view/browse.html.php +++ b/module/job/view/browse.html.php @@ -13,8 +13,8 @@
- + @@ -71,14 +71,14 @@
id"), sprintf('%03d', $release->id));?>id"), sprintf('%03d', $release->id));?> marker ? " " : ''; - echo html::a($this->createLink('release', 'view', "release=$release->id"), $release->name) . $flagIcon; + echo html::a(inlink('view', "release=$release->id"), $release->name) . $flagIcon; ?> project) ? $release->buildName : html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName);?> createLink('release', 'view', "releaseID=$release->id&type=story&link=true"), ' ', '', "class='btn' title='{$lang->release->linkStory}'"); - if(common::hasPriv('release', 'linkBug')) echo html::a($this->createLink('release', 'view', "releaseID=$release->id&type=bug&link=true"), ' ', '', "class='btn' title='{$lang->release->linkBug}'"); + if(common::hasPriv('release', 'linkStory')) echo html::a(inlink('view', "releaseID=$release->id&type=story&link=true"), ' ', '', "class='btn' title='{$lang->release->linkStory}'"); + if(common::hasPriv('release', 'linkBug')) echo html::a(inlink('view', "releaseID=$release->id&type=bug&link=true"), ' ', '', "class='btn' title='{$lang->release->linkBug}'"); if(common::hasPriv('release', 'changeStatus', $release)) { $changedStatus = $release->status == 'normal' ? 'terminate' : 'normal'; echo html::a($this->createLink('release', 'changeStatus', "releaseID=$release->id&status=$changedStatus"), ' ', 'hiddenwin', "class='btn' title='{$lang->release->changeStatusList[$changedStatus]}'"); } - common::printIcon('release', 'edit', "release=$release->id", $release, 'list', '', '', '', ''); + common::printIcon('release', 'edit', "release=$release->id", $release, 'list'); if(common::hasPriv('release', 'delete', $release)) { $deleteURL = $this->createLink('release', 'delete', "releaseID=$release->id&confirm=yes"); diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index 43ad358601..bcf4780386 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -16,7 +16,7 @@ release->confirmUnlinkBug)?>