* Add group.

This commit is contained in:
Yagami
2020-09-23 17:21:30 +08:00
parent ddfc52b612
commit d9e57180de
6 changed files with 81 additions and 40 deletions
+1 -1
View File
@@ -4,7 +4,7 @@ DROP `catID`,
ADD `model` char(30) NOT NULL AFTER `id`,
CHANGE `type` `type` char(30) NOT NULL DEFAULT 'sprint' AFTER `model`,
ADD `product` varchar(20) NOT NULL DEFAULT 'single' AFTER `type`,
ADD `lifetime` char(30) COLLATE NOT NULL AFTER `product`,
ADD `lifetime` char(30) NOT NULL AFTER `product`,
ADD `budget` varchar(30) NOT NULL DEFAULT '0' AFTER `lifetime`,
ADD `budgetUnit` char(30) NOT NULL DEFAULT 'yuan' AFTER `budget`,
ADD `percent` float unsigned NOT NULL DEFAULT '0' AFTER `budgetUnit`,
+75 -35
View File
@@ -159,42 +159,82 @@ $lang->todo->methodOrder[80] = 'batchClose';
/* Program. */
$lang->resource->program = new stdclass();
$lang->resource->program->index = 'index';
$lang->resource->program->browse = 'browse';
$lang->resource->program->create = 'create';
$lang->resource->program->createGuide = 'createGuide';
$lang->resource->program->edit = 'edit';
$lang->resource->program->start = 'start';
$lang->resource->program->finish = 'finish';
$lang->resource->program->delete = 'delete';
$lang->resource->program->suspend = 'suspend';
$lang->resource->program->activate = 'activate';
$lang->resource->program->close = 'close';
$lang->resource->program->setPlanduration = 'setPlanduration';
$lang->resource->program->group = 'group';
$lang->resource->program->createGroup = 'createGroup';
$lang->resource->program->editGroup = 'editGroup';
$lang->resource->program->copyGroup = 'copyGroup';
$lang->resource->program->manageView = 'manageView';
$lang->resource->program->managePriv = 'managePriv';
$lang->resource->program->manageGroupMember = 'manageGroupMember';
$lang->resource->program->manageMembers = 'manageMembers';
$lang->resource->program->export = 'export';
$lang->resource->program->PGMIndex = 'PGMIndex';
$lang->resource->program->PGMBrowse = 'PGMBrowse';
$lang->resource->program->PGMProduct = 'PGMProduct';
$lang->resource->program->PGMCreate = 'PGMCreate';
$lang->resource->program->PGMEdit = 'PGMEdit';
$lang->resource->program->PGMView = 'PGMView';
$lang->resource->program->PGMClose = 'PGMClose';
$lang->resource->program->PGMActivate = 'PGMActivate';
$lang->resource->program->PGMDelete = 'PGMDelete';
$lang->resource->program->PGMGroup = 'PGMGroup';
$lang->resource->program->PGMCreateGroup = 'PGMCreateGroup';
$lang->resource->program->PGMEditGroup = 'PGMEditGroup';
$lang->resource->program->PGMCopyGroup = 'PGMCopyGroup';
$lang->resource->program->PGMManageView = 'PGMManageView';
$lang->resource->program->PGMManagePriv = 'PGMManagePriv';
$lang->resource->program->PGMManageGroupMember = 'PGMManageGroupMember';
$lang->resource->program->PGMManageMembers = 'PGMManageMembers';
$lang->resource->program->PGMProject = 'PGMProject';
$lang->resource->program->export = 'export';
$lang->resource->program->index = 'PRJIndex';
$lang->resource->program->PRJBrowse = 'PRJBrowse';
$lang->resource->program->PRJProgramTitle = 'PRJModuleOpen';
$lang->resource->program->PRJCreate = 'PRJCreate';
$lang->resource->program->PRJEdit = 'PRJEdit';
$lang->resource->program->PRJGroup = 'PRJGroup';
$lang->resource->program->PRJCreateGroup = 'PRJCreateGroup';
$lang->resource->program->PRJManageView = 'PRJManageView';
$lang->resource->program->PRJManagePriv = 'PRJManagePriv';
$lang->resource->program->PRJManageMembers = 'PRJManageMembers';
$lang->resource->program->PRJManageGroupMember = 'PRJManageGroupMember';
$lang->resource->program->PRJCopyGroup = 'PRJCopyGroup';
$lang->resource->program->PRJEditGroup = 'PRJEditGroup';
$lang->resource->program->PRJStart = 'PRJStart';
$lang->resource->program->PRJSuspend = 'PRJSuspend';
$lang->resource->program->PRJClose = 'PRJClose';
$lang->resource->program->PRJActivate = 'PRJActivate';
$lang->resource->program->PRJDelete = 'PRJDelete';
$lang->program->methodOrder[5] = 'index';
$lang->program->methodOrder[10] = 'browse';
$lang->program->methodOrder[15] = 'create';
$lang->program->methodOrder[20] = 'createGuide';
$lang->program->methodOrder[25] = 'edit';
$lang->program->methodOrder[30] = 'start';
$lang->program->methodOrder[35] = 'finish';
$lang->program->methodOrder[40] = 'delete';
$lang->program->methodOrder[45] = 'suspend';
$lang->program->methodOrder[50] = 'activate';
$lang->program->methodOrder[55] = 'close';
$lang->program->methodOrder[60] = 'setPlanduration';
$lang->program->methodOrder[65] = 'manageMembers';
$lang->program->methodOrder[70] = 'export';
$lang->program->methodOrder[5] = 'PGMIndex';
$lang->program->methodOrder[10] = 'PGMBrowse';
$lang->program->methodOrder[15] = 'PGMProduct';
$lang->program->methodOrder[20] = 'PGMCreate';
$lang->program->methodOrder[25] = 'PGMEdit';
$lang->program->methodOrder[30] = 'PGMView';
$lang->program->methodOrder[35] = 'PGMClose';
$lang->program->methodOrder[40] = 'PGMActivate';
$lang->program->methodOrder[45] = 'PGMDelete';
$lang->program->methodOrder[50] = 'PGMGroup';
$lang->program->methodOrder[55] = 'PGMCreateGroup';
$lang->program->methodOrder[60] = 'PGMEditGroup';
$lang->program->methodOrder[65] = 'PGMCopyGroup';
$lang->program->methodOrder[70] = 'PGMManageView';
$lang->program->methodOrder[75] = 'PGMManagePriv';
$lang->program->methodOrder[80] = 'PGMManageGroupMember';
$lang->program->methodOrder[85] = 'PGMManageMembers';
$lang->program->methodOrder[90] = 'PGMProject';
$lang->program->methodOrder[95] = 'export';
$lang->program->methodOrder[100] = 'PRJIndex';
$lang->program->methodOrder[105] = 'PRJBrowse';
$lang->program->methodOrder[110] = 'PRJProgramTitle';
$lang->program->methodOrder[115] = 'PRJCreate';
$lang->program->methodOrder[120] = 'PRJEdit';
$lang->program->methodOrder[125] = 'PRJGroup';
$lang->program->methodOrder[130] = 'PRJCreateGroup';
$lang->program->methodOrder[135] = 'PRJManageView';
$lang->program->methodOrder[140] = 'PRJManagePriv';
$lang->program->methodOrder[145] = 'PRJManageMembers';
$lang->program->methodOrder[150] = 'PRJManageGroupMember';
$lang->program->methodOrder[155] = 'PRJCopyGroup';
$lang->program->methodOrder[160] = 'PRJEditGroup';
$lang->program->methodOrder[165] = 'PRJStart';
$lang->program->methodOrder[170] = 'PRJSuspend';
$lang->program->methodOrder[175] = 'PRJClose';
$lang->program->methodOrder[180] = 'PRJActivate';
$lang->program->methodOrder[185] = 'PRJUpdateOrder';
$lang->program->methodOrder[190] = 'PRJDelete';
/* Issue . */
$lang->resource->issue = new stdclass();
+1 -1
View File
@@ -30,7 +30,7 @@ class product extends control
$this->loadModel('user');
/* Get all products, if no, goto the create page. */
$this->products = $this->product->getPairs('nocode', $this->session->program);
$this->products = $this->product->getPairs('nocode');
if(empty($this->products) and strpos(',all,create,index,showerrornone,', $this->methodName) === false and $this->app->getViewType() != 'mhtml') $this->locate($this->createLink('product', 'create'));
$this->view->products = $this->products;
}
+2 -1
View File
@@ -21,7 +21,7 @@ $lang->program->PRJCopyGroup = '项目复制分组';
$lang->program->PRJManageView = '项目维护视图';
$lang->program->PRJManagePriv = '项目维护权限';
$lang->program->PRJManageMembers = '项目团队';
$lang->program->PRJExport = '导出';
$lang->program->export = '导出';
$lang->program->PRJManageGroupMember = '维护分组用户';
$lang->program->PRJModuleSetting = '项目集设置';
$lang->program->PRJModuleOpen = '显示项目集名';
@@ -174,6 +174,7 @@ $lang->program->PGMCreateGuide = '选择项目模板';
$lang->program->PGMEdit = '编辑项目集';
$lang->program->PGMBrowse = '项目集列表';
$lang->program->PGMProduct = '产品列表';
$lang->program->PGMProject = '项目列表';
$lang->program->PGMAll = '所有项目集';
$lang->program->PGMStart = '启动项目集';
$lang->program->PGMFinish = '完成项目集';
+1 -1
View File
@@ -95,7 +95,7 @@ class projectModel extends model
$this->session->set('project', $projectID);
$products = $this->loadModel('product')->getPairs('', $program->id);
$products = $this->loadModel('product')->getPairs();
/* Unset story, bug, build and testtask if type is ops. */
if($project and $project->type == 'ops')
+1 -1
View File
@@ -62,7 +62,7 @@
<div class="detail-title"><?php echo $lang->story->legendVerify;?></div>
<div class="detail-content article-content"><?php echo $story->verify;?></div>
</div>
<?php if($program->template == 'waterfall' and $story->type == 'requirement'):?>
<?php if($program->model == 'waterfall' and $story->type == 'requirement'):?>
<?php if(!empty($track)):?>
<div class="detail">
<div class="detail-title"><?php echo $lang->story->track;?></div>