diff --git a/db/update17.6.1.sql b/db/update17.6.1.sql new file mode 100644 index 0000000000..e8749557cf --- /dev/null +++ b/db/update17.6.1.sql @@ -0,0 +1 @@ +ALTER table `zt_project` ADD `noExecution` enum('0', '1') NOT NULL DEFAULT '0'; diff --git a/db/zentao.sql b/db/zentao.sql index d5266fc5e3..da4c5c0d2b 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -1193,6 +1193,7 @@ CREATE TABLE IF NOT EXISTS `zt_project` ( `vision` varchar(10) NOT NULL DEFAULT 'rnd', `displayCards` smallint(6) NOT NULL default '0', `fluidBoard` enum('0','1') NOT NULL DEFAULT '0', + `noExecution` enum('0', '1') NOT NULL DEFAULT '0', `deleted` enum('0','1') NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `parent` (`parent`), diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php index 1929912983..030dff1817 100644 --- a/module/block/lang/zh-tw.php +++ b/module/block/lang/zh-tw.php @@ -260,14 +260,11 @@ $lang->block->default['full']['my']['4']['grid'] = 4; $lang->block->default['full']['my']['4']['source'] = 'todo'; $lang->block->default['full']['my']['4']['params']['count'] = '20'; -if($config->systemMode == 'new') -{ - $lang->block->default['full']['my']['5']['title'] = '項目統計'; - $lang->block->default['full']['my']['5']['block'] = 'statistic'; - $lang->block->default['full']['my']['5']['source'] = 'project'; - $lang->block->default['full']['my']['5']['grid'] = 8; - $lang->block->default['full']['my']['5']['params']['count'] = '20'; -} +$lang->block->default['full']['my']['5']['title'] = '項目統計'; +$lang->block->default['full']['my']['5']['block'] = 'statistic'; +$lang->block->default['full']['my']['5']['source'] = 'project'; +$lang->block->default['full']['my']['5']['grid'] = 8; +$lang->block->default['full']['my']['5']['params']['count'] = '20'; $lang->block->default['full']['my']['6']['title'] = '我的貢獻'; $lang->block->default['full']['my']['6']['block'] = 'contribute'; @@ -292,23 +289,15 @@ $lang->block->default['full']['my']['8']['params']['issueCount'] = '20'; $lang->block->default['full']['my']['8']['params']['storyCount'] = '20'; $lang->block->default['full']['my']['8']['params']['meetingCount'] = '20'; -if($config->systemMode == 'new') -{ - $lang->block->default['full']['my']['9']['title'] = '項目人力投入'; - $lang->block->default['full']['my']['9']['block'] = 'projectteam'; - $lang->block->default['full']['my']['9']['source'] = 'project'; - $lang->block->default['full']['my']['9']['grid'] = 8; -} +$lang->block->default['full']['my']['9']['title'] = '項目人力投入'; +$lang->block->default['full']['my']['9']['block'] = 'projectteam'; +$lang->block->default['full']['my']['9']['source'] = 'project'; +$lang->block->default['full']['my']['9']['grid'] = 8; $lang->block->default['full']['my']['10']['title'] = '項目列表'; $lang->block->default['full']['my']['10']['block'] = 'project'; $lang->block->default['full']['my']['10']['source'] = 'project'; $lang->block->default['full']['my']['10']['grid'] = 8; -if($config->systemMode == 'classic') -{ - $lang->block->default['full']['my']['10']['block'] = 'execution'; - $lang->block->default['full']['my']['10']['source'] = 'execution'; -} $lang->block->default['full']['my']['10']['params']['orderBy'] = 'id_desc'; $lang->block->default['full']['my']['10']['params']['count'] = '15'; @@ -334,7 +323,7 @@ $lang->block->availableBlocks->issue = '我的問題'; $lang->block->availableBlocks->meeting = '我的會議'; $lang->block->availableBlocks->feedback = '我的反饋'; -if($config->systemMode == 'new') $lang->block->moduleList['project'] = '項目'; +$lang->block->moduleList['project'] = '項目'; $lang->block->moduleList['product'] = $lang->productCommon; $lang->block->moduleList['execution'] = $lang->execution->common; $lang->block->moduleList['qa'] = '測試'; @@ -345,7 +334,7 @@ $lang->block->modules['project']->availableBlocks = new stdclass(); $lang->block->modules['project']->availableBlocks->project = '項目列表'; $lang->block->modules['project']->availableBlocks->recentproject = '近期項目'; $lang->block->modules['project']->availableBlocks->statistic = '項目統計'; -if($config->systemMode == 'new') $lang->block->modules['project']->availableBlocks->projectteam = '項目人力投入'; +$lang->block->modules['project']->availableBlocks->projectteam = '項目人力投入'; $lang->block->modules['scrum']['index'] = new stdclass(); $lang->block->modules['scrum']['index']->availableBlocks = new stdclass(); @@ -502,7 +491,7 @@ $lang->block->typeList->testtask['done'] = '已測版本'; $lang->block->typeList->testtask['all'] = '全部'; $lang->block->modules['project']->moreLinkList = new stdclass(); -$lang->block->modules['project']->moreLinkList->recentproject = $config->systemMode == 'new' ? 'project|browse|' : 'execution|all|'; +$lang->block->modules['project']->moreLinkList->recentproject = 'project|browse|'; $lang->block->modules['project']->moreLinkList->statistic = 'project|browse|'; $lang->block->modules['project']->moreLinkList->project = 'project|browse|'; $lang->block->modules['project']->moreLinkList->cmmireport = 'weekly|index|'; diff --git a/module/bug/config.php b/module/bug/config.php index ad67ba65e3..e330b23679 100644 --- a/module/bug/config.php +++ b/module/bug/config.php @@ -38,18 +38,10 @@ $config->bug->exportFields = 'id, product, branch, module, project, execution, s lastEditedBy, lastEditedDate, files ,feedbackBy, notifyEmail'; -if($config->systemMode == 'classic') $config->bug->exportFields = str_replace(' project,', '', $config->bug->exportFields); $config->bug->list->customCreateFields = 'execution,noticefeedbackBy,story,task,pri,severity,os,browser,deadline,mailto,keywords'; $config->bug->list->customBatchEditFields = 'type,severity,pri,productplan,assignedTo,deadline,resolvedBy,resolution,os,browser,keywords'; -if($config->systemMode == 'new') -{ - $config->bug->list->customBatchCreateFields = 'project,execution,steps,type,pri,deadline,severity,os,browser,keywords'; -} -else -{ - $config->bug->list->customBatchCreateFields = 'execution,steps,type,pri,deadline,severity,os,browser,keywords'; -} +$config->bug->list->customBatchCreateFields = 'project,execution,steps,type,pri,deadline,severity,os,browser,keywords'; $config->bug->custom = new stdclass(); $config->bug->custom->createFields = $config->bug->list->customCreateFields; @@ -83,7 +75,7 @@ $config->bug->search['fields']['status'] = $lang->bug->status; $config->bug->search['fields']['confirmed'] = $lang->bug->confirmed; $config->bug->search['fields']['story'] = $lang->bug->story; -if($config->systemMode == 'new') $config->bug->search['fields']['project'] = $lang->bug->project; +$config->bug->search['fields']['project'] = $lang->bug->project; $config->bug->search['fields']['product'] = $lang->bug->product; $config->bug->search['fields']['branch'] = ''; $config->bug->search['fields']['plan'] = $lang->bug->productplan; @@ -129,7 +121,7 @@ $config->bug->search['params']['status'] = array('operator' => '=', $config->bug->search['params']['confirmed'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->bug->confirmedList); $config->bug->search['params']['story'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); -if($config->systemMode == 'new') $config->bug->search['params']['project'] = array('operator' => '=', 'control' => 'select', 'values' => ''); +$config->bug->search['params']['project'] = array('operator' => '=', 'control' => 'select', 'values' => ''); $config->bug->search['params']['product'] = array('operator' => '=', 'control' => 'select', 'values' => ''); $config->bug->search['params']['branch'] = array('operator' => '=', 'control' => 'select', 'values' => ''); $config->bug->search['params']['plan'] = array('operator' => '=', 'control' => 'select', 'values' => ''); @@ -209,15 +201,12 @@ $config->bug->datatable->fieldList['type']['fixed'] = 'no'; $config->bug->datatable->fieldList['type']['width'] = '90'; $config->bug->datatable->fieldList['type']['required'] = 'no'; -if($config->systemMode == 'new') -{ - $config->bug->datatable->fieldList['project']['title'] = 'project'; - $config->bug->datatable->fieldList['project']['fixed'] = 'no'; - $config->bug->datatable->fieldList['project']['width'] = '120'; - $config->bug->datatable->fieldList['project']['required'] = 'no'; - $config->bug->datatable->fieldList['project']['control'] = 'hidden'; - $config->bug->datatable->fieldList['project']['dataSource'] = array('module' => 'product', 'method' => 'getProjectPairsByProduct', 'params' => '$productID'); -} +$config->bug->datatable->fieldList['project']['title'] = 'project'; +$config->bug->datatable->fieldList['project']['fixed'] = 'no'; +$config->bug->datatable->fieldList['project']['width'] = '120'; +$config->bug->datatable->fieldList['project']['required'] = 'no'; +$config->bug->datatable->fieldList['project']['control'] = 'hidden'; +$config->bug->datatable->fieldList['project']['dataSource'] = array('module' => 'product', 'method' => 'getProjectPairsByProduct', 'params' => '$productID'); $config->bug->datatable->fieldList['execution']['title'] = 'execution'; $config->bug->datatable->fieldList['execution']['fixed'] = 'no'; diff --git a/module/bug/control.php b/module/bug/control.php index a77e087cab..7ca593e3ce 100755 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -630,20 +630,13 @@ class bug extends control /* Get executions. */ $executions = array(0 => ''); - if(isset($projects[$projectID]) or $this->config->systemMode == 'classic') $executions += $this->product->getExecutionPairsByProduct($productID, $branch ? "0,$branch" : 0, 'id_desc', $projectID); + if(isset($projects[$projectID])) $executions += $this->product->getExecutionPairsByProduct($productID, $branch ? "0,$branch" : 0, 'id_desc', $projectID); $execution = $executionID ? $this->loadModel('execution')->getByID($executionID) : ''; $executions = isset($executions[$executionID]) ? $executions : $executions + array($executionID => $execution->name); /* Set custom. */ foreach(explode(',', $this->config->bug->list->customCreateFields) as $field) $customFields[$field] = $this->lang->bug->$field; - /* In repair classic mode, when the project is required, the asterisk is not displayed. */ - if($this->config->systemMode == 'classic' and strpos(",{$this->config->bug->create->requiredFields},", ',project,') !== false) - { - $this->config->bug->create->requiredFields = str_replace(',project,', ',execution,', ",{$this->config->bug->create->requiredFields},"); - $this->config->bug->create->requiredFields = trim($this->config->bug->create->requiredFields, ','); - } - $this->view->title = isset($this->products[$productID]) ? $this->products[$productID] . $this->lang->colon . $this->lang->bug->create : $this->lang->bug->create; $this->view->customFields = $customFields; $this->view->showFields = $this->config->bug->custom->createFields; diff --git a/module/bug/model.php b/module/bug/model.php index 029d351d5f..81b285335c 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -66,7 +66,7 @@ class bugModel extends model ->setDefault('openedBuild', '') ->setDefault('notifyEmail', '') ->setDefault('deadline', '0000-00-00') - ->setIF($this->config->systemMode == 'new' && $this->lang->navGroup->bug != 'qa', 'project', $this->session->project) + ->setIF($this->lang->navGroup->bug != 'qa', 'project', $this->session->project) ->setIF(strpos($this->config->bug->create->requiredFields, 'deadline') !== false, 'deadline', $this->post->deadline) ->setIF($this->post->assignedTo != '', 'assignedDate', $now) ->setIF($this->post->story != false, 'storyVersion', $this->loadModel('story')->getVersion($this->post->story)) @@ -89,9 +89,6 @@ class bugModel extends model $bug = $this->loadModel('file')->processImgURL($bug, $this->config->bug->editor->create['id'], $this->post->uid); - /* Use classic mode to replace required project. */ - if($this->config->systemMode == 'classic' and strpos($this->config->bug->create->requiredFields, 'project') !== false) $this->config->bug->create->requiredFields = str_replace('project', 'execution', $this->config->bug->create->requiredFields); - $this->dao->insert(TABLE_BUG)->data($bug) ->autoCheck() ->checkIF($bug->notifyEmail, 'notifyEmail', 'email') @@ -288,7 +285,7 @@ class bugModel extends model } } - if($this->config->systemMode == 'new' && $this->lang->navGroup->bug != 'qa') $bug->project = $this->session->project; + if($this->lang->navGroup->bug != 'qa') $bug->project = $this->session->project; $this->dao->insert(TABLE_BUG)->data($bug) ->autoCheck() ->batchCheck($this->config->bug->create->requiredFields, 'notempty') @@ -1617,7 +1614,7 @@ class bugModel extends model $this->config->bug->search['actionURL'] = $actionURL; $this->config->bug->search['queryID'] = $queryID; - if($this->config->systemMode == 'new') $this->config->bug->search['params']['project']['values'] = $projectParams; + $this->config->bug->search['params']['project']['values'] = $projectParams; $this->config->bug->search['params']['product']['values'] = $productParams; $this->config->bug->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs($productID); $this->config->bug->search['params']['module']['values'] = $modules; @@ -2041,8 +2038,7 @@ class bugModel extends model $users = $this->dao->select("t2.id, t2.account, t2.realname")->from(TABLE_TEAM)->alias('t1') ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account') ->where('t1.root')->in(array_keys($projects)) - ->beginIF($this->config->systemMode == 'new')->andWhere('t1.type')->eq('project')->fi() - ->beginIF($this->config->systemMode == 'classic')->andWhere('t1.type')->eq('execution')->fi() + ->andWhere('t1.type')->eq('project') ->andWhere('t2.deleted')->eq(0) ->fi() ->fetchAll('account'); diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index c99a3a42f6..e385e28e06 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -78,9 +78,9 @@ if($this->app->tab == 'project') js::set('objectID', $projectID); + projectMode) and $config->projectMode == 'noExecution');?> - systemMode == 'classic') $lang->bug->project = $lang->bug->execution;?> bug->project : $lang->bug->type;?> @@ -111,7 +111,7 @@ if($this->app->tab == 'project') js::set('objectID', $projectID); - systemMode == 'new'):?> +
diff --git a/module/common/model.php b/module/common/model.php index 3390089b3b..de6e34cf60 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -49,40 +49,32 @@ class commonModel extends model global $app; $rawModule = $app->rawModule; - if($this->config->systemMode == 'classic') + if($rawModule == 'task' or $rawModule == 'effort') { - if($rawModule == 'task') $this->syncExecutionStatus($objectID); + $taskID = $objectID; + $execution = $this->syncExecutionStatus($taskID); + $project = $this->syncProjectStatus($execution); + $this->syncProgramStatus($project); } - - if($this->config->systemMode == 'new') + if($rawModule == 'execution') { - if($rawModule == 'task' or $rawModule == 'effort') - { - $taskID = $objectID; - $execution = $this->syncExecutionStatus($taskID); - $project = $this->syncProjectStatus($execution); - $this->syncProgramStatus($project); - } - if($rawModule == 'execution') - { - $executionID = $objectID; - $execution = $this->dao->select('id, project, grade, parent, status, deleted')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch(); - $this->syncExecutionByChild($execution); - $project = $this->syncProjectStatus($execution); - $this->syncProgramStatus($project); - } - if($rawModule == 'project') - { - $projectID = $objectID; - $project = $this->dao->select('id, parent, path')->from(TABLE_PROJECT)->where('id')->eq($projectID)->fetch(); - $this->syncProgramStatus($project); - } - if($rawModule == 'program') - { - $programID = $objectID; - $program = $this->dao->select('id, parent, path')->from(TABLE_PROGRAM)->where('id')->eq($programID)->fetch(); - $this->syncProgramStatus($program); - } + $executionID = $objectID; + $execution = $this->dao->select('id, project, grade, parent, status, deleted')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch(); + $this->syncExecutionByChild($execution); + $project = $this->syncProjectStatus($execution); + $this->syncProgramStatus($project); + } + if($rawModule == 'project') + { + $projectID = $objectID; + $project = $this->dao->select('id, parent, path')->from(TABLE_PROJECT)->where('id')->eq($projectID)->fetch(); + $this->syncProgramStatus($project); + } + if($rawModule == 'program' and $this->config->systemMode == 'new') + { + $programID = $objectID; + $program = $this->dao->select('id, parent, path')->from(TABLE_PROGRAM)->where('id')->eq($programID)->fetch(); + $this->syncProgramStatus($program); } } @@ -938,7 +930,6 @@ class commonModel extends model if($tab == 'product') $currentMethod = 'all'; } - if($config->systemMode == 'classic' and $tab == 'execution') $icon = zget($lang->navIcons, 'project', ''); $link = helper::createLink($currentModule, $currentMethod); $className = $tab == 'devops' ? 'btn num' : 'btn'; $html = $link ? html::a($link, "$icon {$lang->$tab->common}", '', "class='$className' style='padding-top: 2px'") : "$icon {$lang->$tab->common}"; @@ -1248,9 +1239,10 @@ class commonModel extends model echo "
- config->systemMode == 'classic' or $execution->grade == 1):?> + grade == 1):?>
execution->unlinkedProducts;?>
diff --git a/module/group/lang/de.php b/module/group/lang/de.php index 4c5500747c..15e565c248 100644 --- a/module/group/lang/de.php +++ b/module/group/lang/de.php @@ -47,10 +47,7 @@ $lang->group->more = 'More'; $lang->group->allCheck = 'All'; $lang->group->noGroup = 'No group'; $lang->group->repeat = "『%s』『%s』exists.Please adjust it and try again."; - -global $config; -if($config->systemMode == 'new') $lang->group->noneProject = 'No Project'; -if($config->systemMode == 'classic') $lang->group->noneProject = 'No Project'; +$lang->group->noneProject = 'No Project'; $lang->group->id = 'ID'; $lang->group->name = 'Name'; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index 70e4659fb5..3f5a031f85 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -47,10 +47,7 @@ $lang->group->more = 'More'; $lang->group->allCheck = 'All'; $lang->group->noGroup = 'No group'; $lang->group->repeat = "『%s』『%s』exists.Please adjust it and try again."; - -global $config; -if($config->systemMode == 'new') $lang->group->noneProject = 'No Project'; -if($config->systemMode == 'classic') $lang->group->noneProject = "No {$lang->executionCommon}"; +$lang->group->noneProject = 'No Project'; $lang->group->id = 'ID'; $lang->group->name = 'Group'; diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php index f4cdf89881..0e0ba4b355 100644 --- a/module/group/lang/fr.php +++ b/module/group/lang/fr.php @@ -47,10 +47,7 @@ $lang->group->more = 'More'; $lang->group->allCheck = 'All'; $lang->group->noGroup = 'Aucun groupe'; $lang->group->repeat = "『%s』『%s』exists.Please adjust it and try again."; - -global $config; -if($config->systemMode == 'new') $lang->group->noneProject = 'No Project'; -if($config->systemMode == 'classic') $lang->group->noneProject = 'No Project'; +$lang->group->noneProject = 'No Project'; $lang->group->id = 'ID'; $lang->group->name = 'Groupe'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 12118a855c..eee81f1bde 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -152,40 +152,6 @@ $lang->personnel->methodOrder[10] = 'invest'; $lang->personnel->methodOrder[15] = 'whitelist'; $lang->personnel->methodOrder[20] = 'addWhitelist'; -/* Design. */ -$lang->resource->design = new stdclass(); -$lang->resource->design->browse = 'browse'; -$lang->resource->design->view = 'view'; -$lang->resource->design->create = 'create'; -$lang->resource->design->batchCreate = 'batchCreate'; -$lang->resource->design->edit = 'edit'; -$lang->resource->design->assignTo = 'assignTo'; -$lang->resource->design->delete = 'delete'; -$lang->resource->design->linkCommit = 'linkCommit'; -$lang->resource->design->viewCommit = 'viewCommit'; -$lang->resource->design->unlinkCommit = 'unlinkCommit'; -$lang->resource->design->revision = 'revision'; - -$lang->design->methodOrder[5] = 'browse'; -$lang->design->methodOrder[10] = 'view'; -$lang->design->methodOrder[15] = 'create'; -$lang->design->methodOrder[20] = 'batchCreate'; -$lang->design->methodOrder[25] = 'edit'; -$lang->design->methodOrder[30] = 'assignTo'; -$lang->design->methodOrder[35] = 'delete'; -$lang->design->methodOrder[40] = 'linkCommit'; -$lang->design->methodOrder[45] = 'viewCommit'; -$lang->design->methodOrder[50] = 'unlinkCommit'; -$lang->design->methodOrder[55] = 'revision'; - -/* Program plan. */ -$lang->resource->programplan = new stdclass(); -$lang->resource->programplan->create = 'create'; -$lang->resource->programplan->edit = 'edit'; - -$lang->programplan->methodOrder[0] = 'create'; -$lang->programplan->methodOrder[5] = 'edit'; - /* Project. */ $lang->resource->project = new stdclass(); $lang->resource->project->index = 'index'; @@ -317,22 +283,6 @@ $lang->projectrelease->methodOrder[65] = 'batchUnlinkBug'; $lang->projectrelease->methodOrder[70] = 'changeStatus'; $lang->projectrelease->methodOrder[75] = 'notify'; -/* Stage. */ -$lang->resource->stage = new stdclass(); -$lang->resource->stage->browse = 'browse'; -$lang->resource->stage->create = 'create'; -$lang->resource->stage->batchCreate = 'batchCreate'; -$lang->resource->stage->edit = 'edit'; -$lang->resource->stage->setType = 'setType'; -$lang->resource->stage->delete = 'delete'; - -$lang->stage->methodOrder[5] = 'browse'; -$lang->stage->methodOrder[10] = 'create'; -$lang->stage->methodOrder[15] = 'batchCreate'; -$lang->stage->methodOrder[20] = 'edit'; -$lang->stage->methodOrder[25] = 'setType'; -$lang->stage->methodOrder[30] = 'delete'; - /* Stakeholer. */ $lang->resource->stakeholder = new stdclass(); $lang->resource->stakeholder->browse = 'browse'; @@ -372,6 +322,31 @@ $lang->stakeholder->methodOrder[80] = 'userIssue'; global $config; if($config->systemMode == 'new') { + /* Design. */ + $lang->resource->design = new stdclass(); + $lang->resource->design->browse = 'browse'; + $lang->resource->design->view = 'view'; + $lang->resource->design->create = 'create'; + $lang->resource->design->batchCreate = 'batchCreate'; + $lang->resource->design->edit = 'edit'; + $lang->resource->design->assignTo = 'assignTo'; + $lang->resource->design->delete = 'delete'; + $lang->resource->design->linkCommit = 'linkCommit'; + $lang->resource->design->viewCommit = 'viewCommit'; + $lang->resource->design->unlinkCommit = 'unlinkCommit'; + $lang->resource->design->revision = 'revision'; + + $lang->design->methodOrder[5] = 'browse'; + $lang->design->methodOrder[10] = 'view'; + $lang->design->methodOrder[15] = 'create'; + $lang->design->methodOrder[20] = 'batchCreate'; + $lang->design->methodOrder[25] = 'edit'; + $lang->design->methodOrder[30] = 'assignTo'; + $lang->design->methodOrder[35] = 'delete'; + $lang->design->methodOrder[40] = 'linkCommit'; + $lang->design->methodOrder[45] = 'viewCommit'; + $lang->design->methodOrder[50] = 'unlinkCommit'; + $lang->design->methodOrder[55] = 'revision'; /* Program. */ $lang->resource->program = new stdclass(); @@ -414,7 +389,31 @@ if($config->systemMode == 'new') $lang->program->methodOrder[90] = 'unbindWhitelist'; $lang->program->methodOrder[95] = 'updateOrder'; + /* Program plan. */ + $lang->resource->programplan = new stdclass(); + $lang->resource->programplan->create = 'create'; + $lang->resource->programplan->edit = 'edit'; + + $lang->programplan->methodOrder[0] = 'create'; + $lang->programplan->methodOrder[5] = 'edit'; + $lang->resource->project->programTitle = 'moduleOpen'; + + /* Stage. */ + $lang->resource->stage = new stdclass(); + $lang->resource->stage->browse = 'browse'; + $lang->resource->stage->create = 'create'; + $lang->resource->stage->batchCreate = 'batchCreate'; + $lang->resource->stage->edit = 'edit'; + $lang->resource->stage->setType = 'setType'; + $lang->resource->stage->delete = 'delete'; + + $lang->stage->methodOrder[5] = 'browse'; + $lang->stage->methodOrder[10] = 'create'; + $lang->stage->methodOrder[15] = 'batchCreate'; + $lang->stage->methodOrder[20] = 'edit'; + $lang->stage->methodOrder[25] = 'setType'; + $lang->stage->methodOrder[30] = 'delete'; } /* Product. */ @@ -821,7 +820,7 @@ $lang->resource->execution->addWhitelist = 'addWhitelist'; $lang->resource->execution->unbindWhitelist = 'unbindWhitelist'; $lang->resource->execution->storyEstimate = 'storyEstimate'; $lang->resource->execution->storyView = 'storyView'; -if($config->systemMode == 'new') $lang->resource->execution->executionkanban = 'kanbanAction'; +$lang->resource->execution->executionkanban = 'kanbanAction'; $lang->resource->execution->kanban = 'RDKanban'; $lang->resource->execution->setKanban = 'setKanban'; //if($config->systemMode == 'classic') $lang->resource->project->list = 'list'; diff --git a/module/group/lang/vi.php b/module/group/lang/vi.php index aa3da9a7bf..c615bad361 100644 --- a/module/group/lang/vi.php +++ b/module/group/lang/vi.php @@ -36,10 +36,6 @@ $lang->group->noneProgram = "No Program"; $lang->group->noneProduct = "Không có {$lang->productCommon}"; $lang->group->noneProject = "No Project"; -global $config; -if($config->systemMode == 'new') $lang->group->noneProject = 'No Project'; -if($config->systemMode == 'classic') $lang->group->noneProject = "No {$lang->executionCommon}"; - $lang->group->id = 'ID'; $lang->group->name = 'Nhóm'; $lang->group->desc = 'Mô tả'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index 9559c806b7..e4d9550abe 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -47,10 +47,7 @@ $lang->group->more = '更多'; $lang->group->allCheck = '全部'; $lang->group->noGroup = '暂时没有分组。'; $lang->group->repeat = "『%s』已经有『%s』这条记录了，请调整后再试。"; - -global $config; -if($config->systemMode == 'new') $lang->group->noneProject = '暂时没有项目'; -if($config->systemMode == 'classic') $lang->group->noneProject = "暂时没有{$lang->executionCommon}"; +$lang->group->noneProject = '暂时没有项目'; $lang->group->id = '编号'; $lang->group->name = '分组名称'; diff --git a/module/group/lang/zh-tw.php b/module/group/lang/zh-tw.php index 68869a77c6..af522ffc39 100644 --- a/module/group/lang/zh-tw.php +++ b/module/group/lang/zh-tw.php @@ -38,10 +38,7 @@ $lang->group->noneProduct = "暫時沒有{$lang->productCommon}"; $lang->group->noneExecution = "暫時沒有{$lang->execution->common}"; $lang->group->project = '項目'; $lang->group->group = '分組'; - -global $config; -if($config->systemMode == 'new') $lang->group->noneProject = '暫時沒有項目'; -if($config->systemMode == 'classic') $lang->group->noneProject = "暫時沒有{$lang->executionCommon}"; +$lang->group->noneProject = '暫時沒有項目'; $lang->group->id = '編號'; $lang->group->name = '分組名稱'; diff --git a/module/group/view/manageprojectadmin.html.php b/module/group/view/manageprojectadmin.html.php index 370e3a3cbc..1523a76f7e 100644 --- a/module/group/view/manageprojectadmin.html.php +++ b/module/group/view/manageprojectadmin.html.php @@ -43,6 +43,7 @@ systemMode == 'new' ? '' : 'hidden';?> systemMode == 'new' ? 4 : 3;?> + projectMode) and $config->projectMode == 'noExecution');?> $group):?> @@ -59,12 +60,25 @@ group]", array(1 => ''), $group->programs == 'all' ? 1 : '', "onchange=toggleDisabled(this);");?> + + +
+ projects == 'all' ? "disabled='disabled'" : '';?> + group->manageProject;?> + group][]", $projects, $group->projects == 'all' ? '' : $group->projects, "class='form-control picker-select' multiple $disabled");?> +
+ + + group]", array(1 => ''), $group->projects == 'all' ? 1 : '', "onchange=toggleDisabled(this);");?> + + +
@@ -77,6 +91,7 @@ group]", array(1 => ''), $group->projects == 'all' ? 1 : '', "onchange=toggleDisabled(this);");?> +
@@ -89,6 +104,7 @@ group]", array(1 => ''), $group->products == 'all' ? 1 : '', "onchange=toggleDisabled(this);");?> +
@@ -101,6 +117,7 @@ group]", array(1 => ''), $group->executions == 'all' ? 1 : '', "onchange=toggleDisabled(this);");?> + @@ -116,11 +133,23 @@ ''), '', "onchange=toggleDisabled(this);");?> + + +
+ group->manageProject;?> + +
+ + + ''), '', "onchange=toggleDisabled(this);");?> + + +
@@ -132,6 +161,7 @@ ''), '', "onchange=toggleDisabled(this);");?> +
@@ -143,6 +173,7 @@ ''), '', "onchange=toggleDisabled(this);");?> +
@@ -154,6 +185,7 @@ ''), '', "onchange=toggleDisabled(this);");?> + diff --git a/module/kanban/control.php b/module/kanban/control.php index ceefd81560..c679094654 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -1297,16 +1297,8 @@ class kanban extends control $builds2Imported = array(); $projects = array($this->lang->kanban->allProjects); - if($this->config->systemMode == 'classic') - { - $projects += $this->loadModel('execution')->getPairs(); - $builds2Imported = $this->build->getExecutionBuilds($selectedProjectID, '', '', 't1.date_desc,t1.id_desc', $pager); - } - else - { - $projects += $this->loadModel('project')->getPairsByProgram('', 'all', false, 'order_asc', 'kanban'); - $builds2Imported = $this->build->getProjectBuilds($selectedProjectID, 'all', 0, 't1.date_desc,t1.id_desc', $pager); - } + $projects += $this->loadModel('project')->getPairsByProgram('', 'all', false, 'order_asc', 'kanban'); + $builds2Imported = $this->build->getProjectBuilds($selectedProjectID, 'all', 0, 't1.date_desc,t1.id_desc', $pager); $this->view->projects = $projects; $this->view->selectedProjectID = $selectedProjectID; diff --git a/module/kanban/lang/de.php b/module/kanban/lang/de.php index 55016fdf0b..ba613427d2 100644 --- a/module/kanban/lang/de.php +++ b/module/kanban/lang/de.php @@ -84,7 +84,7 @@ $lang->kanban->importRelease = 'Release'; $lang->kanban->importExecution = $lang->execution->common; $lang->kanban->importBuild = 'Build'; $lang->kanban->allKanban = 'All Kanban'; -$lang->kanban->allProjects = 'All ' . ($this->config->systemMode == 'classic' ? $lang->executionCommon : 'Projects'); +$lang->kanban->allProjects = 'All Projects'; $lang->kanban->allProducts = 'All Products'; $lang->kanban->mine = 'Mine'; $lang->kanban->alignment = 'Alignment'; @@ -124,7 +124,7 @@ $lang->kanban->cardCountTip = 'Please enter the number of cards'; $lang->kanban->selectedKanban = 'Please select Kanban'; $lang->kanban->selectedProduct = 'Please select Product'; -$lang->kanban->selectedProject = 'Please select ' . ($this->config->systemMode == 'classic' ? $lang->executionCommon : 'Project'); +$lang->kanban->selectedProject = 'Please select Project'; $lang->kanban->selectedLane = 'Target Lane'; $lang->kanban->aclGroup['open'] = 'Open'; diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index de64542c0f..edf3676058 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -84,7 +84,7 @@ $lang->kanban->importRelease = 'Release'; $lang->kanban->importExecution = $lang->execution->common; $lang->kanban->importBuild = 'Build'; $lang->kanban->allKanban = 'All Kanban'; -$lang->kanban->allProjects = 'All ' . ($this->config->systemMode == 'classic' ? $lang->executionCommon : 'Projects'); +$lang->kanban->allProjects = 'All Projects'; $lang->kanban->allProducts = 'All Products'; $lang->kanban->mine = 'Mine'; $lang->kanban->alignment = 'Alignment'; @@ -124,7 +124,7 @@ $lang->kanban->cardCountTip = 'Please enter the number of cards'; $lang->kanban->selectedKanban = 'Please select Kanban'; $lang->kanban->selectedProduct = 'Please select Product'; -$lang->kanban->selectedProject = 'Please select ' . ($this->config->systemMode == 'classic' ? $lang->executionCommon : 'Project'); +$lang->kanban->selectedProject = 'Please select Project'; $lang->kanban->selectedLane = 'Target Lane'; $lang->kanban->aclGroup['open'] = 'Open'; diff --git a/module/kanban/lang/fr.php b/module/kanban/lang/fr.php index 03ac3373b4..306e42a7d0 100644 --- a/module/kanban/lang/fr.php +++ b/module/kanban/lang/fr.php @@ -84,7 +84,7 @@ $lang->kanban->importRelease = 'Release'; $lang->kanban->importExecution = $lang->execution->common; $lang->kanban->importBuild = 'Build'; $lang->kanban->allKanban = 'All Kanban'; -$lang->kanban->allProjects = 'All ' . ($this->config->systemMode == 'classic' ? $lang->executionCommon : 'Projects'); +$lang->kanban->allProjects = 'All Projects'; $lang->kanban->allProducts = 'All Products'; $lang->kanban->mine = 'Mine'; $lang->kanban->alignment = 'Alignment'; @@ -124,7 +124,7 @@ $lang->kanban->cardCountTip = 'Please enter the number of cards'; $lang->kanban->selectedKanban = 'Please select Kanban'; $lang->kanban->selectedProduct = 'Please select Product'; -$lang->kanban->selectedProject = 'Please select ' . ($this->config->systemMode == 'classic' ? $lang->executionCommon : 'Project'); +$lang->kanban->selectedProject = 'Please select Project'; $lang->kanban->selectedLane = 'Target Lane'; $lang->kanban->aclGroup['open'] = 'Open'; diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index 89d62c0633..0c0c68347b 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -84,7 +84,7 @@ $lang->kanban->importRelease = '发布'; $lang->kanban->importExecution = $lang->execution->common; $lang->kanban->importBuild = '版本'; $lang->kanban->allKanban = '所有看板'; -$lang->kanban->allProjects = '所有' . ($this->config->systemMode == 'classic' ? $lang->executionCommon : '项目'); +$lang->kanban->allProjects = '所有项目'; $lang->kanban->allProducts = '所有产品'; $lang->kanban->mine = '我负责'; $lang->kanban->alignment = '列标题对齐方式'; @@ -124,7 +124,7 @@ $lang->kanban->cardCountTip = '请输入卡片数量'; $lang->kanban->selectedKanban = '请选择看板'; $lang->kanban->selectedProduct = '请选择产品'; -$lang->kanban->selectedProject = '请选择' . ($this->config->systemMode == 'classic' ? $lang->executionCommon : '项目'); +$lang->kanban->selectedProject = '请选择项目'; $lang->kanban->selectedLane = '目标泳道'; $lang->kanban->aclGroup['open'] = '公开'; diff --git a/module/kanban/view/importexecution.html.php b/module/kanban/view/importexecution.html.php index 6819252b5e..302e56206d 100644 --- a/module/kanban/view/importexecution.html.php +++ b/module/kanban/view/importexecution.html.php @@ -23,10 +23,8 @@
- systemMode == 'new'):?> kanban->selectedProject;?> - kanban->selectedLane;?>
@@ -88,9 +86,6 @@
noData;?>
-systemMode == 'classic'):?> - - diff --git a/module/kanban/view/viewarchivedcard.html.php b/module/kanban/view/viewarchivedcard.html.php index 2c4c142e36..84e8605586 100644 --- a/module/kanban/view/viewarchivedcard.html.php +++ b/module/kanban/view/viewarchivedcard.html.php @@ -220,8 +220,7 @@ $(function() if($item.children('.productplan').length) icon = ''; if($item.children('.release').length) icon = ''; - if($item.children('.execution').length && systemMode == 'new') icon = ''; - if($item.children('.execution').length && systemMode == 'classic') icon = ''; + if($item.children('.execution').length) icon = ''; $item.children('.cardName').prepend(icon); }); diff --git a/module/my/lang/de.php b/module/my/lang/de.php index b2f6ece0d3..a20327ed31 100644 --- a/module/my/lang/de.php +++ b/module/my/lang/de.php @@ -100,7 +100,7 @@ $lang->my->executionLink = 'Execution Default Page'; $lang->my->programLinkList = array(); $lang->my->programLinkList['program-browse'] = 'By default, you go to the program list, where you can view all of the programs'; $lang->my->programLinkList['program-project'] = 'By default, you go to the list of items in the most recent program, and you can view all items under the current program'; -if($config->systemMode == 'new') $lang->my->programLinkList['program-kanban'] = 'Enter the Program Kanban by default, and check the progress of all Programs'; +$lang->my->programLinkList['program-kanban'] = 'Enter the Program Kanban by default, and check the progress of all Programs'; $lang->my->productLinkList = array(); $lang->my->productLinkList['product-index'] = 'The default access to the product home page, you can understand the company’s overall product status'; @@ -109,21 +109,16 @@ $lang->my->productLinkList['product-dashboard'] = 'By default, go to the latest $lang->my->productLinkList['product-browse'] = 'By default, go to the list of requirements for the most recent product and see the requirements under the current product'; $lang->my->productLinkList['product-kanban'] = 'Enter the Product Kanban by default, and check the progress of all Products'; -global $config; $lang->my->projectLinkList = array(); $lang->my->projectLinkList['project-browse'] = 'By default, you go to the project list, where you can view all the projects'; $lang->my->projectLinkList['project-execution'] = 'Go to Project-Exection by default. You can check all information in Execution'; $lang->my->projectLinkList['project-index'] = 'By default, go to the most recent project dashboard to see the current project overview'; -if($config->systemMode == 'new') $lang->my->projectLinkList['project-kanban'] = 'Enter the Project Kanban by default, and check the progress of all Projects'; +$lang->my->projectLinkList['project-kanban'] = 'Enter the Project Kanban by default, and check the progress of all Projects'; $lang->my->executionLinkList = array(); -if($config->systemMode == 'new') -{ - $lang->my->executionLinkList['execution-all'] = 'Enter the execution list by default, you can view all executions'; - $lang->my->executionLinkList['execution-task'] = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration'; - $lang->my->executionLinkList['execution-executionkanban'] = 'By default, you can enter the execution Kanban to view the execution status of projects in progress'; -} -if($config->systemMode == 'lean') $lang->my->executionLinkList['execution-task'] = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration'; +$lang->my->executionLinkList['execution-all'] = 'Enter the execution list by default, you can view all executions'; +$lang->my->executionLinkList['execution-task'] = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration'; +$lang->my->executionLinkList['execution-executionkanban'] = 'By default, you can enter the execution Kanban to view the execution status of projects in progress'; $lang->my->guideChangeTheme = <<"Young Blue" theme is available now!

diff --git a/module/my/lang/en.php b/module/my/lang/en.php index 7e97146c16..185ad56a1a 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -100,7 +100,7 @@ $lang->my->executionLink = 'Execution Default Page'; $lang->my->programLinkList = array(); $lang->my->programLinkList['program-browse'] = 'By default, you go to the program list, where you can view all of the programs'; $lang->my->programLinkList['program-project'] = 'By default, you go to the list of items in the most recent program, and you can view all items under the current program'; -if($config->systemMode == 'new') $lang->my->programLinkList['program-kanban'] = 'Enter the Program Kanban by default, and check the progress of all Programs'; +$lang->my->programLinkList['program-kanban'] = 'Enter the Program Kanban by default, and check the progress of all Programs'; $lang->my->productLinkList = array(); $lang->my->productLinkList['product-index'] = 'The default access to the product home page, you can understand the company’s overall product status'; @@ -109,21 +109,16 @@ $lang->my->productLinkList['product-dashboard'] = 'By default, go to the latest $lang->my->productLinkList['product-browse'] = 'By default, go to the list of requirements for the most recent product and see the requirements under the current product'; $lang->my->productLinkList['product-kanban'] = 'Enter the Product Kanban by default, and check the progress of all Products'; -global $config; $lang->my->projectLinkList = array(); $lang->my->projectLinkList['project-browse'] = 'By default, you go to the project list, where you can view all the projects'; $lang->my->projectLinkList['project-execution'] = 'Go to Project-Exection by default. You can check all information in Execution'; $lang->my->projectLinkList['project-index'] = 'By default, go to the most recent project dashboard to see the current project overview'; -if($config->systemMode == 'new') $lang->my->projectLinkList['project-kanban'] = 'Enter the Project Kanban by default, and check the progress of all Projects'; +$lang->my->projectLinkList['project-kanban'] = 'Enter the Project Kanban by default, and check the progress of all Projects'; $lang->my->executionLinkList = array(); -if($config->systemMode == 'new') -{ - $lang->my->executionLinkList['execution-all'] = 'Enter the execution list by default, you can view all executions'; - $lang->my->executionLinkList['execution-task'] = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration'; - $lang->my->executionLinkList['execution-executionkanban'] = 'By default, you can enter the execution Kanban to view the execution status of projects in progress'; -} -if($config->systemMode == 'lean') $lang->my->executionLinkList['execution-task'] = "By default, enter the list of the most recently {$lang->executionCommon} task, and you can view the task information under the current {$lang->executionCommon}"; +$lang->my->executionLinkList['execution-all'] = 'Enter the execution list by default, you can view all executions'; +$lang->my->executionLinkList['execution-task'] = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration'; +$lang->my->executionLinkList['execution-executionkanban'] = 'By default, you can enter the execution Kanban to view the execution status of projects in progress'; $lang->my->guideChangeTheme = <<"Young Blue" theme is available now!

diff --git a/module/my/lang/fr.php b/module/my/lang/fr.php index b2f6ece0d3..a20327ed31 100644 --- a/module/my/lang/fr.php +++ b/module/my/lang/fr.php @@ -100,7 +100,7 @@ $lang->my->executionLink = 'Execution Default Page'; $lang->my->programLinkList = array(); $lang->my->programLinkList['program-browse'] = 'By default, you go to the program list, where you can view all of the programs'; $lang->my->programLinkList['program-project'] = 'By default, you go to the list of items in the most recent program, and you can view all items under the current program'; -if($config->systemMode == 'new') $lang->my->programLinkList['program-kanban'] = 'Enter the Program Kanban by default, and check the progress of all Programs'; +$lang->my->programLinkList['program-kanban'] = 'Enter the Program Kanban by default, and check the progress of all Programs'; $lang->my->productLinkList = array(); $lang->my->productLinkList['product-index'] = 'The default access to the product home page, you can understand the company’s overall product status'; @@ -109,21 +109,16 @@ $lang->my->productLinkList['product-dashboard'] = 'By default, go to the latest $lang->my->productLinkList['product-browse'] = 'By default, go to the list of requirements for the most recent product and see the requirements under the current product'; $lang->my->productLinkList['product-kanban'] = 'Enter the Product Kanban by default, and check the progress of all Products'; -global $config; $lang->my->projectLinkList = array(); $lang->my->projectLinkList['project-browse'] = 'By default, you go to the project list, where you can view all the projects'; $lang->my->projectLinkList['project-execution'] = 'Go to Project-Exection by default. You can check all information in Execution'; $lang->my->projectLinkList['project-index'] = 'By default, go to the most recent project dashboard to see the current project overview'; -if($config->systemMode == 'new') $lang->my->projectLinkList['project-kanban'] = 'Enter the Project Kanban by default, and check the progress of all Projects'; +$lang->my->projectLinkList['project-kanban'] = 'Enter the Project Kanban by default, and check the progress of all Projects'; $lang->my->executionLinkList = array(); -if($config->systemMode == 'new') -{ - $lang->my->executionLinkList['execution-all'] = 'Enter the execution list by default, you can view all executions'; - $lang->my->executionLinkList['execution-task'] = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration'; - $lang->my->executionLinkList['execution-executionkanban'] = 'By default, you can enter the execution Kanban to view the execution status of projects in progress'; -} -if($config->systemMode == 'lean') $lang->my->executionLinkList['execution-task'] = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration'; +$lang->my->executionLinkList['execution-all'] = 'Enter the execution list by default, you can view all executions'; +$lang->my->executionLinkList['execution-task'] = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration'; +$lang->my->executionLinkList['execution-executionkanban'] = 'By default, you can enter the execution Kanban to view the execution status of projects in progress'; $lang->my->guideChangeTheme = <<"Young Blue" theme is available now!

diff --git a/module/my/lang/vi.php b/module/my/lang/vi.php index b558580030..62f85039bc 100644 --- a/module/my/lang/vi.php +++ b/module/my/lang/vi.php @@ -80,13 +80,12 @@ $lang->my->form->lblAccount = 'Account Info'; $lang->my->programLink = 'Program Default Page'; $lang->my->productLink = 'Product Default Page'; $lang->my->projectLink = 'Project Default Page'; -if($config->systemMode == 'classic') $lang->my->executionLink = $lang->executionCommon . ' Default Page'; -if($config->systemMode == 'new') $lang->my->executionLink = 'Execution Default Page'; +$lang->my->executionLink = 'Execution Default Page'; $lang->my->programLinkList = array(); $lang->my->programLinkList['program-browse'] = 'By default, you go to the program list, where you can view all of the programs'; $lang->my->programLinkList['program-project'] = 'By default, you go to the list of items in the most recent program, and you can view all items under the current program'; -if($config->systemMode == 'new') $lang->my->programLinkList['program-kanban'] = 'Enter the Program Kanban by default, and check the progress of all Programs'; +$lang->my->programLinkList['program-kanban'] = 'Enter the Program Kanban by default, and check the progress of all Programs'; $lang->my->productLinkList = array(); $lang->my->productLinkList['product-index'] = 'The default access to the product home page, you can understand the company’s overall product status'; @@ -95,21 +94,16 @@ $lang->my->productLinkList['product-dashboard'] = 'By default, go to the latest $lang->my->productLinkList['product-browse'] = 'By default, go to the list of requirements for the most recent product and see the requirements under the current product'; $lang->my->productLinkList['product-kanban'] = 'Enter the Product Kanban by default, and check the progress of all Products'; -global $config; $lang->my->projectLinkList = array(); $lang->my->projectLinkList['project-browse'] = 'By default, you go to the project list, where you can view all the projects'; $lang->my->projectLinkList['project-execution'] = 'Go to Project-Exection by default. You can check all information in Execution'; $lang->my->projectLinkList['project-index'] = 'By default, go to the most recent project dashboard to see the current project overview'; -if($config->systemMode == 'new') $lang->my->projectLinkList['project-kanban'] = 'Enter the Project Kanban by default, and check the progress of all Projects'; +$lang->my->projectLinkList['project-kanban'] = 'Enter the Project Kanban by default, and check the progress of all Projects'; $lang->my->executionLinkList = array(); -if($config->systemMode == 'new') -{ - $lang->my->executionLinkList['execution-all'] = 'Enter the execution list by default, you can view all executions'; - $lang->my->executionLinkList['execution-task'] = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration'; - $lang->my->executionLinkList['execution-executionkanban'] = 'By default, you can enter the execution Kanban to view the execution status of projects in progress'; -} -if($config->systemMode == 'classic') $lang->my->executionLinkList['execution-task'] = "By default, enter the list of the most recently {$lang->executionCommon} task, and you can view the task information under the current {$lang->executionCommon}"; +$lang->my->executionLinkList['execution-all'] = 'Enter the execution list by default, you can view all executions'; +$lang->my->executionLinkList['execution-task'] = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration'; +$lang->my->executionLinkList['execution-executionkanban'] = 'By default, you can enter the execution Kanban to view the execution status of projects in progress'; $lang->my->guideChangeTheme = <<"Young Blue" theme is available now!

diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php index d8e0bec065..0a9daea551 100644 --- a/module/my/lang/zh-cn.php +++ b/module/my/lang/zh-cn.php @@ -100,7 +100,7 @@ $lang->my->executionLink = '执行默认着陆页'; $lang->my->programLinkList = array(); $lang->my->programLinkList['program-browse'] = '默认进入项目集列表，可以查看所有的项目集'; $lang->my->programLinkList['program-project'] = '默认进入最近一个项目集的项目列表，可以查看当前项目集下所有项目'; -if($config->systemMode == 'new') $lang->my->programLinkList['program-kanban'] = '默认进入项目集看板，可以可视化的查看到所有项目集的进展情况'; +$lang->my->programLinkList['program-kanban'] = '默认进入项目集看板，可以可视化的查看到所有项目集的进展情况'; $lang->my->productLinkList = array(); $lang->my->productLinkList['product-index'] = '默认进入产品主页，可以了解公司整体的产品状况'; @@ -109,21 +109,16 @@ $lang->my->productLinkList['product-dashboard'] = '默认进入最近一个产 $lang->my->productLinkList['product-browse'] = '默认进入最近一个产品的需求列表，可以查看当前产品下的需求信息'; $lang->my->productLinkList['product-kanban'] = '默认进入产品看板，可以可视化的查看到所有产品的进展情况'; -global $config; $lang->my->projectLinkList = array(); $lang->my->projectLinkList['project-browse'] = '默认进入项目列表，可以查看所有的项目'; $lang->my->projectLinkList['project-execution'] = '默认进入项目下所有执行列表，查看所有执行信息'; $lang->my->projectLinkList['project-index'] = '默认进入最近一个项目仪表盘，可以查看当前项目概况'; -if($config->systemMode == 'new') $lang->my->projectLinkList['project-kanban'] = '默认进入项目看板，可以可视化的查看到所有项目的进展情况'; +$lang->my->projectLinkList['project-kanban'] = '默认进入项目看板，可以可视化的查看到所有项目的进展情况'; $lang->my->executionLinkList = array(); -if($config->systemMode == 'new') -{ - $lang->my->executionLinkList['execution-all'] = '默认进入执行列表，可以查看所有的执行'; - $lang->my->executionLinkList['execution-task'] = '默认进入最近一个执行的任务列表，可以查看当前迭代下的任务信息'; - $lang->my->executionLinkList['execution-executionkanban'] = '默认进入执行看板，可以查看进行中项目的执行情况'; -} -if($config->systemMode == 'lean') $lang->my->executionLinkList['execution-task'] = "默认进入最近一个{$lang->executionCommon}的任务列表，可以查看当前{$lang->executionCommon}下的任务信息"; +$lang->my->executionLinkList['execution-all'] = '默认进入执行列表，可以查看所有的执行'; +$lang->my->executionLinkList['execution-task'] = '默认进入最近一个执行的任务列表，可以查看当前迭代下的任务信息'; +$lang->my->executionLinkList['execution-executionkanban'] = '默认进入执行看板，可以查看进行中项目的执行情况'; $lang->my->guideChangeTheme = <<全新“青春蓝”主题上线了！

diff --git a/module/my/lang/zh-tw.php b/module/my/lang/zh-tw.php index dc42ee55d2..97bda1a4d2 100644 --- a/module/my/lang/zh-tw.php +++ b/module/my/lang/zh-tw.php @@ -89,13 +89,12 @@ $lang->my->form->lblAccount = '帳號信息'; $lang->my->programLink = '項目集預設着陸頁'; $lang->my->productLink = '產品預設着陸頁'; $lang->my->projectLink = '項目預設着陸頁'; -if($config->systemMode == 'classic') $lang->my->executionLink = $lang->executionCommon . '預設着陸頁'; -if($config->systemMode == 'new') $lang->my->executionLink = '執行預設着陸頁'; +$lang->my->executionLink = '執行預設着陸頁'; $lang->my->programLinkList = array(); $lang->my->programLinkList['program-browse'] = '預設進入項目集列表，可以查看所有的項目集'; $lang->my->programLinkList['program-project'] = '預設進入最近一個項目集的項目列表，可以查看當前項目集下所有項目'; -if($config->systemMode == 'new') $lang->my->programLinkList['program-kanban'] = '預設進入項目集看板，可以可視化的查看到所有項目集的進展情況'; +$lang->my->programLinkList['program-kanban'] = '預設進入項目集看板，可以可視化的查看到所有項目集的進展情況'; $lang->my->productLinkList = array(); $lang->my->productLinkList['product-index'] = '預設進入產品主頁，可以瞭解公司整體的產品狀況'; @@ -109,16 +108,12 @@ $lang->my->projectLinkList = array(); $lang->my->projectLinkList['project-browse'] = '預設進入項目列表，可以查看所有的項目'; $lang->my->projectLinkList['project-execution'] = '預設進入項目下所有執行列表，查看所有執行信息'; $lang->my->projectLinkList['project-index'] = '預設進入最近一個項目儀表盤，可以查看當前項目概況'; -if($config->systemMode == 'new') $lang->my->projectLinkList['project-kanban'] = '預設進入項目看板，可以可視化的查看到所有項目的進展情況'; +$lang->my->projectLinkList['project-kanban'] = '預設進入項目看板，可以可視化的查看到所有項目的進展情況'; $lang->my->executionLinkList = array(); -if($config->systemMode == 'new') -{ - $lang->my->executionLinkList['execution-all'] = '預設進入執行列表，可以查看所有的執行'; - $lang->my->executionLinkList['execution-task'] = '預設進入最近一個執行的任務列表，可以查看當前迭代下的任務信息'; - $lang->my->executionLinkList['execution-executionkanban'] = '預設進入執行看板，可以查看進行中項目的執行情況'; -} -if($config->systemMode == 'classic') $lang->my->executionLinkList['execution-task'] = "預設進入最近一個{$lang->executionCommon}的任務列表，可以查看當前{$lang->executionCommon}下的任務信息"; +$lang->my->executionLinkList['execution-all'] = '預設進入執行列表，可以查看所有的執行'; +$lang->my->executionLinkList['execution-task'] = '預設進入最近一個執行的任務列表，可以查看當前迭代下的任務信息'; +$lang->my->executionLinkList['execution-executionkanban'] = '預設進入執行看板，可以查看進行中項目的執行情況'; $lang->my->guideChangeTheme = <<全新“青春藍”主題上線了！

diff --git a/module/my/model.php b/module/my/model.php index 14bc238ccf..97473e12e5 100644 --- a/module/my/model.php +++ b/module/my/model.php @@ -648,7 +648,7 @@ class myModel extends model unset($this->config->bug->search['fields']['closedBy']); } - if($this->config->systemMode == 'new') $this->config->bug->search['params']['project']['values'] = $this->loadModel('project')->getPairsByProgram() + array('all' => $this->lang->bug->allProject) + array('' => ''); + $this->config->bug->search['params']['project']['values'] = $this->loadModel('project')->getPairsByProgram() + array('all' => $this->lang->bug->allProject) + array('' => ''); $this->config->bug->search['params']['execution']['values'] = $this->loadModel('execution')->getPairs(); $this->config->bug->search['params']['product']['values'] = $products + array('' => ''); $this->config->bug->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs(); @@ -682,13 +682,12 @@ class myModel extends model $queryName = $type == 'contribute' ? 'contributeRisk' : 'workRisk'; $this->app->loadConfig('risk'); - $this->config->risk->search['module'] = $queryName; - $this->config->risk->search['actionURL'] = $actionURL; - $this->config->risk->search['queryID'] = $queryID; + $this->config->risk->search['module'] = $queryName; + $this->config->risk->search['actionURL'] = $actionURL; + $this->config->risk->search['queryID'] = $queryID; $this->config->risk->search['params']['project']['values'] = array('') + $projects; - if($this->config->systemMode == 'classic') unset($this->config->risk->search['fields']['project']); unset($this->config->risk->search['fields']['module']); $this->loadModel('search')->setSearchParams($this->config->risk->search); diff --git a/module/my/view/selectproject.html.php b/module/my/view/selectproject.html.php index 526bedf958..552e240097 100644 --- a/module/my/view/selectproject.html.php +++ b/module/my/view/selectproject.html.php @@ -7,7 +7,6 @@
- config->systemMode == 'new'):?> @@ -16,12 +15,6 @@ - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -88,7 +88,7 @@ - + diff --git a/module/user/model.php b/module/user/model.php index e779699ede..68a89ddc69 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -1756,7 +1756,7 @@ class userModel extends model if($allProducts === null) $allProducts = $this->dao->select('id,PO,QD,RD,createdBy,acl,whitelist,program,createdBy')->from(TABLE_PRODUCT)->where('acl')->ne('open')->fetchAll('id'); if($allProjects === null) $allProjects = $this->dao->select('id,PO,PM,QD,RD,acl,type,path,parent,openedBy')->from(TABLE_PROJECT)->where('acl')->ne('open')->andWhere('type')->eq('project')->fetchAll('id'); if($allPrograms === null) $allPrograms = $this->dao->select('id,PO,PM,QD,RD,acl,type,path,parent,openedBy')->from(TABLE_PROGRAM)->where('acl')->ne('open')->andWhere('type')->eq('program')->fetchAll('id'); - if($allSprints === null) $allSprints = $this->dao->select('id,PO,PM,QD,RD,acl,project,path,parent,type,openedBy')->from(TABLE_PROJECT)->where('acl')->eq('private')->beginIF($this->config->systemMode == 'new')->andWhere('type')->in('sprint,stage,kanban')->fi()->fetchAll('id'); + if($allSprints === null) $allSprints = $this->dao->select('id,PO,PM,QD,RD,acl,project,path,parent,type,openedBy')->from(TABLE_PROJECT)->where('acl')->eq('private')->andWhere('type')->in('sprint,stage,kanban')->fetchAll('id'); /* Get admins. */ $manageObjects = array(); @@ -1938,8 +1938,7 @@ class userModel extends model $teamGroups = array(); $stmt = $this->dao->select('root,account')->from(TABLE_TEAM) ->where('1=1') - ->beginIF($this->config->systemMode == 'new')->andWhere('type')->eq('project')->fi() - ->beginIF($this->config->systemMode == 'classic')->andWhere('type')->eq('execution')->fi() + ->andWhere('type')->eq('project') ->andWhere('root')->in(array_keys($projectProducts)) ->andWhere('root')->ne(0) ->query(); @@ -2057,8 +2056,8 @@ class userModel extends model /* Set opened sprints and stages into userview. */ $openedSprints = $this->dao->select('id')->from(TABLE_PROJECT) ->where('acl')->eq('open') - ->beginIF($this->config->systemMode == 'new')->andWhere('type')->in('sprint,stage,kanban')->fi() - ->beginIF($this->config->systemMode == 'new')->andWhere('project')->in($userView->projects)->fi() + ->andWhere('type')->in('sprint,stage,kanban') + ->andWhere('project')->in($userView->projects) ->fetchAll('id'); $openedSprints = join(',', array_keys($openedSprints)); @@ -2516,7 +2515,7 @@ class userModel extends model } /* Judge sprint auth. */ - if(($project->type == 'sprint' or $project->type == 'stage' or $project->type == 'kanban') and $project->acl == 'private' and $this->config->systemMode == 'new') + if(($project->type == 'sprint' or $project->type == 'stage' or $project->type == 'kanban') and $project->acl == 'private') { $parent = $this->dao->select('openedBy,PM')->from(TABLE_PROJECT)->where('id')->eq($project->project)->fetch(); if(empty($parent)) return false; @@ -2611,7 +2610,7 @@ class userModel extends model } /* Judge sprint auth. */ - if(($project->type == 'sprint' || $project->type == 'stage') && $project->acl == 'private' && $this->config->systemMode == 'new') + if(($project->type == 'sprint' || $project->type == 'stage') && $project->acl == 'private') { $parent = $this->dao->select('openedBy,PM')->from(TABLE_PROJECT)->where('id')->eq($project->project)->fetch(); $users[$parent->openedBy] = $parent->openedBy;
feedback->project;?> feedback->execution;?>
execution->common;?>
feedback->nextStep, '',"class='btn btn-primary btn-wide iframe hidden' data-app='my' data-width='95%' id=taskProjectA");?> @@ -65,17 +58,9 @@ function getFeedbackID(obj) { var feedbackID = $(obj).attr("data-id"); $('#feedbackID').val(feedbackID); - if(systemMode == 'new') - { - $('#taskProjects').change(); - getProjects(obj); - getExecutions(0); - } - else - { - var projectID = $(obj).attr("data-product"); - getExecutions(projectID); - } + $('#taskProjects').change(); + getProjects(obj); + getExecutions(0); } function getProjects(obj) @@ -110,7 +95,7 @@ function initToBug(obj) function getExecutions(projectID) { - if(systemMode == 'new' && projectID) + if(projectID) { var langLink = createLink('feedback', 'ajaxGetExecutionLang', 'projectID=' + projectID); $.post(langLink, function(executionLang) @@ -183,19 +168,13 @@ function changeTaskButton() $('#taskProjectA').addClass('hidden'); } - if(systemMode == 'new' && projectID && executionID) + if(projectID && executionID) { var href = createLink('task', 'create', 'executionID=' + executionID + '&storyID=0&moduleID=0&taskID=0&todoID=0&extra=projectID=' + projectID + ',feedbackID=' + feedbackID, '', true); $('#taskProjectButton').addClass('hidden'); $('#taskProjectA').removeClass('hidden').attr('href', href); } - else if(systemMode == 'classic' && executionID) - { - var href = createLink('task', 'create', 'executionID=' + executionID + '&storyID=0&moduleID=0&taskID=0&todoID=0&extra=projectID=0,feedbackID=' + feedbackID, '', true); - $('#taskProjectButton').addClass('hidden'); - $('#taskProjectA').removeClass('hidden').attr('href', href); - } } function changeButton() diff --git a/module/productplan/control.php b/module/productplan/control.php index 559c0d5c85..8d7aff14c0 100644 --- a/module/productplan/control.php +++ b/module/productplan/control.php @@ -792,7 +792,6 @@ class productplan extends control $pager = new pager($recTotal, $recPerPage, $pageID); /* Build the search form. */ - if($this->config->systemMode == 'classic') unset($this->config->bug->search['fields']['project']); $this->config->bug->search['actionURL'] = $this->createLink('productplan', 'view', "planID=$planID&type=bug&orderBy=$orderBy&link=true¶m=" . helper::safe64Encode('&browseType=bySearch&queryID=myQueryID')); $this->config->bug->search['queryID'] = $queryID; $this->config->bug->search['style'] = 'simple'; @@ -801,7 +800,7 @@ class productplan extends control $this->config->bug->search['params']['openedBuild']['values'] = $this->loadModel('build')->getBuildPairs($productID, $branch = 'all', $params = ''); $this->config->bug->search['params']['resolvedBuild']['values'] = $this->build->getBuildPairs($productID, $branch = 'all', $params = ''); $this->config->bug->search['params']['module']['values'] = $this->loadModel('tree')->getOptionMenu($plan->product, 'bug', 0, $plan->branch); - if($this->config->systemMode == 'new') $this->config->bug->search['params']['project']['values'] = $this->product->getProjectPairsByProduct($productID, $plan->branch); + $this->config->bug->search['params']['project']['values'] = $this->product->getProjectPairsByProduct($productID, $plan->branch); unset($this->config->bug->search['fields']['product']); if($this->session->currentProductType == 'normal') diff --git a/module/program/model.php b/module/program/model.php index ded6984210..c6b4680251 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -581,8 +581,7 @@ class programModel extends model ->andWhere('t1.reviewStatus')->eq('doing') ->fi() ->beginIF($path)->andWhere('t1.path')->like($path . '%')->fi() - ->beginIF(!$queryAll and !$this->app->user->admin and $this->config->systemMode == 'new')->andWhere('t1.id')->in($this->app->user->view->projects)->fi() - ->beginIF(!$queryAll and !$this->app->user->admin and $this->config->systemMode == 'classic')->andWhere('t1.id')->in($this->app->user->view->sprints)->fi() + ->beginIF(!$queryAll and !$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->projects)->fi() ->beginIF($this->cookie->involved or $involved) ->andWhere('t1.openedBy', true)->eq($this->app->user->account) ->orWhere('t1.PM')->eq($this->app->user->account) @@ -1599,26 +1598,36 @@ class programModel extends model */ public function createDefaultProgram() { + $account = isset($this->app->user->account) ? $this->app->user->account : ''; $minBegin = $this->dao->select('min(begin) as min')->from(TABLE_PROJECT)->where('deleted')->eq(0)->fetch('min'); - $program = new stdClass(); - $program->type = 'program'; - $program->name = $this->lang->program->defaultProgram; - $program->budgetUnit = 'CNY'; - $program->whitelist = ''; - $program->status = 'doing'; - $program->grade = 1; - $program->auth = 'extend'; - $program->openedDate = helper::today(); - $program->begin = $minBegin; - $program->end = LONG_TIME; + $program = new stdclass(); + $program->name = $this->lang->program->defaultProgram; + $program->type = 'program'; + $program->budgetUnit = 'CNY'; + $program->status = 'doing'; + $program->auth = 'extend'; + $program->begin = $minBegin; + $program->end = LONG_TIME; + $program->openedBy = $account; + $program->openedDate = helper::now(); + $program->openedVersion = $this->config->version; + $program->acl = 'open'; + $program->grade = 1; + $program->vision = 'rnd'; + + $this->app->loadLang('program'); + $this->app->loadLang('project'); + $this->lang->project->name = $this->lang->program->name; $this->dao->insert(TABLE_PROGRAM)->data($program)->exec(); + if(dao::isError()) return false; - $insertID = $this->dao->lastInsertId(); + $programID = $this->dao->lastInsertId(); - $this->dao->update(TABLE_PROGRAM)->set('path')->eq(",$insertID,")->where('id')->eq($insertID)->exec(); + $this->dao->update(TABLE_PROGRAM)->set('path')->eq(",{$programID},")->set('`order`')->eq($programID * 5)->where('id')->eq($programID)->exec(); + $this->loadModel('action')->create('program', $programID, 'openedbysystem'); - return $insertID; + return $programID; } } diff --git a/module/project/model.php b/module/project/model.php index bffc62e9b5..92e6bc53e7 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -163,7 +163,7 @@ class projectModel extends model $project = $this->dao->select('*')->from(TABLE_PROJECT) ->where('id')->eq($projectID) - ->beginIF($this->config->systemMode == 'new')->andWhere('`type`')->in($type)->fi() + ->andWhere('`type`')->in($type) ->fetch(); if(!$project) return false; @@ -197,12 +197,11 @@ class projectModel extends model ->groupBy('t1.root') ->fetchAll('root'); - $condition = $this->config->systemMode == 'classic' ? 't2.id as project' : 't2.parent as project'; + $condition = 't2.parent as project'; $estimates = $this->dao->select("$condition, sum(estimate) as estimate")->from(TABLE_TASK)->alias('t1') ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.execution = t2.id') ->where('t1.parent')->lt(1) - ->beginIF($this->config->systemMode == 'new')->andWhere('t2.parent')->in($projectIdList)->fi() - ->beginIF($this->config->systemMode == 'classic')->andWhere('t2.id')->in($projectIdList)->fi() + ->andWhere('t2.parent')->in($projectIdList) ->andWhere('t1.deleted')->eq(0) ->andWhere('t2.deleted')->eq(0) ->groupBy('project') @@ -895,7 +894,7 @@ class projectModel extends model $this->config->project->search['params']['parent']['values'] = $programPairs; if(isset($this->config->setCode) and $this->config->setCode == 0) unset($this->config->project->search['fields']['code'], $this->config->project->search['params']['code']); - if($this->config->systemMode == 'lite') unset($this->config->project->search['fields']['parent'], $this->config->project->search['params']['parent']); + if($this->config->systemMode == 'lean') unset($this->config->project->search['fields']['parent'], $this->config->project->search['params']['parent']); $this->loadModel('search')->setSearchParams($this->config->project->search); } @@ -1234,7 +1233,7 @@ class projectModel extends model $this->dao->insert(TABLE_TEAM)->data($member)->exec(); $teamMembers[$account] = $member; } - if($this->config->systemMode == 'new') $this->loadModel('execution')->addProjectMembers($projectID, $teamMembers); + $this->loadModel('execution')->addProjectMembers($projectID, $teamMembers); $whitelist = explode(',', $project->whitelist); $this->loadModel('personnel')->updateWhitelist($whitelist, 'project', $projectID); @@ -2205,9 +2204,9 @@ class projectModel extends model if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getTeamMembers(); $project = $this->getByID($projectID); - $type = $this->config->systemMode == 'new' ? $project->type : 'project'; if(empty($project)) return array(); + $type = $this->config->systemMode == 'new' ? $project->type : 'project'; return $this->dao->select("t1.*, t1.hours * t1.days AS totalHours, t2.id as userID, if(t2.deleted='0', t2.realname, t1.account) as realname")->from(TABLE_TEAM)->alias('t1') ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account') ->where('t1.root')->eq((int)$projectID) @@ -2230,10 +2229,7 @@ class projectModel extends model if(empty($project)) return array(); $type = 'project'; - if($this->config->systemMode == 'new') - { - if($project->type == 'sprint' or $project->type == 'stage' or $project->type == 'kanban') $type = 'execution'; - } + if($project->type == 'sprint' or $project->type == 'stage' or $project->type == 'kanban') $type = 'execution'; $members = $this->dao->select("t1.account, if(t2.deleted='0', t2.realname, t1.account) as realname")->from(TABLE_TEAM)->alias('t1') ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account') @@ -2584,7 +2580,7 @@ class projectModel extends model $menu = ''; $params = "projectID=$project->id"; - $moduleName = $this->config->systemMode == 'classic' ? "execution" : "project"; + $moduleName = "project"; if($project->status == 'wait' || $project->status == 'suspended') { $menu .= $this->buildMenu($moduleName, 'start', $params, $project, 'browse', 'play', '', 'iframe', true); @@ -2607,14 +2603,14 @@ class projectModel extends model $from = $project->from == 'project' ? 'project' : 'pgmproject'; $iframe = $this->app->tab == 'program' ? 'iframe' : ''; $onlyBody = $this->app->tab == 'program' ? true : ''; - $dataApp = $this->config->systemMode == 'classic' ? "data-app=execution" : "data-app=project"; + $dataApp = "data-app=project"; $menu .= $this->buildMenu($moduleName, 'edit', $params, $project, 'browse', 'edit', '', $iframe, $onlyBody, $dataApp); if($this->config->vision != 'lite') { $menu .= $this->buildMenu($moduleName, 'team', $params, $project, 'browse', 'group', '', '', '', $dataApp, $this->lang->execution->team); - if($this->config->systemMode == 'new') $menu .= $this->buildMenu('project', 'group', "$params&programID={$project->programID}", $project, 'browse', 'lock', '', '', '', $dataApp); + $menu .= $this->buildMenu('project', 'group', "$params&programID={$project->programID}", $project, 'browse', 'lock', '', '', '', $dataApp); if(common::hasPriv($moduleName, 'manageProducts') || common::hasPriv($moduleName, 'whitelist') || common::hasPriv($moduleName, 'delete')) { @@ -2622,7 +2618,7 @@ class projectModel extends model $menu .= ""; $menu .= ""; $menu .= ""; @@ -2631,7 +2627,7 @@ class projectModel extends model else { $menu .= $this->buildMenu($moduleName, 'team', $params, $project, 'browse', 'group', '', '', '', $dataApp, $this->lang->execution->team); - if($this->config->systemMode == 'new') $menu .= $this->buildMenu('project', 'whitelist', "$params&module=project&from=$from", $project, 'browse', 'shield-check', '', 'btn-action', '', $dataApp); + $menu .= $this->buildMenu('project', 'whitelist', "$params&module=project&from=$from", $project, 'browse', 'shield-check', '', 'btn-action', '', $dataApp); $menu .= $this->buildMenu($moduleName, "delete", $params, $project, 'browse', 'trash', 'hiddenwin', 'btn-action'); } diff --git a/module/report/model.php b/module/report/model.php index 23dbb69c1b..fb457f3039 100644 --- a/module/report/model.php +++ b/module/report/model.php @@ -1079,9 +1079,8 @@ class reportModel extends model { $projectStatus = $this->dao->select('t1.id,t1.status')->from(TABLE_PROJECT)->alias('t1') ->leftJoin(TABLE_TEAM)->alias('t2')->on("t1.id=t2.root") - ->where('t1.type')->in($this->config->systemMode == 'classic' ? 'sprint,stage,kanban' : 'project') - ->beginIF($this->config->systemMode == 'classic')->andWhere('t2.type')->eq('execution')->fi() - ->beginIF($this->config->systemMode == 'new')->andWhere('t2.type')->eq('project')->fi() + ->where('t1.type')->in('project') + ->andWhere('t2.type')->eq('project') ->beginIF(!empty($accounts))->andWhere('t2.account')->in($accounts)->fi() ->andWhere('t1.deleted')->eq(0) ->fetchPairs('id', 'status'); @@ -1201,10 +1200,7 @@ class reportModel extends model ->fetchAll(); $pairs = array(); - foreach($executions as $execution) - { - $pairs[$execution->id] = $this->config->systemMode == 'new' ? $execution->projectname . '/' .$execution->name : $execution->name; - } + foreach($executions as $execution) $pairs[$execution->id] = $execution->projectname . '/' .$execution->name; return $pairs; } diff --git a/module/report/view/bugcreate.html.php b/module/report/view/bugcreate.html.php index 9c3b4e8589..f3dd5bb8ae 100644 --- a/module/report/view/bugcreate.html.php +++ b/module/report/view/bugcreate.html.php @@ -27,7 +27,7 @@
- config->systemMode == 'classic' ? $lang->executionCommon : $lang->execution->common;?> + execution->common;?>
diff --git a/module/task/control.php b/module/task/control.php index 8fa8b9b497..60e72764b0 100755 --- a/module/task/control.php +++ b/module/task/control.php @@ -291,7 +291,7 @@ class task extends control /* Set Custom*/ foreach(explode(',', $this->config->task->customCreateFields) as $field) $customFields[$field] = $this->lang->task->$field; - $executions = $this->config->systemMode == 'classic' ? $executions : $this->execution->getByProject($projectID, 'noclosed', 0, true); + $executions = $this->execution->getByProject($projectID, 'noclosed', 0, true); $testStoryIdList = $this->loadModel('story')->getTestStories(array_keys($stories), $execution->id); /* Stories that can be used to create test tasks. */ @@ -436,11 +436,8 @@ class task extends control $modules = $this->loadModel('tree')->getTaskOptionMenu($executionID, 0, 0, $showAllModule ? 'allModule' : ''); /* Set Custom*/ - if($this->config->systemMode == 'new') - { - $project = $this->project->getByID($execution->project); - if($project->model == 'waterfall') $this->config->task->create->requiredFields .= ',estStarted,deadline'; - } + $project = $this->project->getByID($execution->project); + if($project->model == 'waterfall') $this->config->task->create->requiredFields .= ',estStarted,deadline'; foreach(explode(',', $this->config->task->customBatchCreateFields) as $field) { @@ -619,7 +616,7 @@ class task extends control $this->view->users = $this->loadModel('user')->getPairs('nodeleted|noclosed', "{$this->view->task->openedBy},{$this->view->task->canceledBy},{$this->view->task->closedBy}"); $this->view->showAllModule = isset($this->config->execution->task->allModule) ? $this->config->execution->task->allModule : ''; $this->view->modules = $this->tree->getTaskOptionMenu($this->view->task->execution, 0, 0, $this->view->showAllModule ? 'allModule' : ''); - $this->view->executions = $this->config->systemMode == 'classic' ? $this->execution->getPairs() : $this->execution->getByProject($task->project, 'noclosed', 0, true, false, $task->execution); + $this->view->executions = $this->execution->getByProject($task->project, 'noclosed', 0, true, false, $task->execution); $this->display(); } @@ -730,11 +727,8 @@ class task extends control /* Set Custom*/ if(isset($execution)) { - if($this->config->systemMode == 'new') - { - $project = $this->project->getByID($execution->project); - if($project->model == 'waterfall') $this->config->task->edit->requiredFields .= ',estStarted,deadline'; - } + $project = $this->project->getByID($execution->project); + if($project->model == 'waterfall') $this->config->task->edit->requiredFields .= ',estStarted,deadline'; foreach(explode(',', $this->config->task->customBatchEditFields) as $field) { diff --git a/module/upgrade/control.php b/module/upgrade/control.php index fbc9e542e5..4282d244fd 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -161,12 +161,18 @@ class upgrade extends control if(version_compare($openVersion, '15_0', '>=') and version_compare($openVersion, '18_0', '<=') and $systemMode != 'new') { $this->loadModel('setting')->setItem('system.common.global.mode', 'lean'); + /* Lean mode create default program. */ $programID = $this->loadModel('program')->createDefaultProgram(); + /* Set default program config. */ $this->loadModel('setting')->setItem('system.common.global.defaultProgram', $programID); + /* 只有没有关联项目集的产品和项目关联到默认项目集下. */ $this->upgrade->relationDefaultProgram($programID); + + $this->upgrade->classic2Lean($programID); + $selectMode = false; } if(version_compare($openVersion, '18_0', '>')) $selectMode = false; @@ -704,9 +710,11 @@ class upgrade extends control $mergeMode = $this->post->projectType; if($mergeMode == 'manually') $this->locate(inlink('mergeProgram')); - $program = $this->upgrade->createDefaultProgram(); - if($mergeMode == 'project') $this->upgrade->upgradeInProjectMode($program->id); - if($mergeMode == 'execution') $this->upgrade->upgradeInExecutionMode($program->id); + if($mode == 'lean') $programID = $this->config->defaultProgram; + if($mode == 'new') $programID = $this->loadModel('program')->createDefaultProgram(); + + if($mergeMode == 'project') $this->upgrade->upgradeInProjectMode($programID); + if($mergeMode == 'execution') $this->upgrade->upgradeInExecutionMode($programID); if(dao::isError()) return print(js::error(dao::getError())); $this->locate(inlink('afterExec', "fromVersion=$fromVersion")); diff --git a/module/upgrade/css/to18guide.css b/module/upgrade/css/to18guide.css index 1d12295a52..56221c51cc 100644 --- a/module/upgrade/css/to18guide.css +++ b/module/upgrade/css/to18guide.css @@ -1,3 +1,7 @@ +.panel {width: 1200px; margin: auto; padding: 0px 40px 40px 40px;} +.panel h1 {margin-top: 20px; margin-bottom: 20px;} +.panel .icon {font-size: 20px;} + #mainContent tr td .icon-close {font-weight: bold; color: #ea644a;} #mainContent tr td .icon-check {font-weight: bold; color: #329d38;} @@ -7,4 +11,4 @@ #useLean {background-color: #ddd!important; padding: 6px 85px;} #useNew {background-color: #ddd!important; padding: 6px 85px;} -#mainContent .datatable {cursor: default;} \ No newline at end of file +#mainContent .datatable {cursor: default;} diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index 35eb124055..9ee5ae026b 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -194,7 +194,7 @@ $lang->upgrade->selectUsage = '请选择使用场景'; $lang->upgrade->useLean = '使用迅捷模式'; $lang->upgrade->useNew = '使用综合模式'; $lang->upgrade->remark = '备注'; -$lang->upgrade->remarkDesc = '后续您还可以在系统的后台自定义中进行切换'; +$lang->upgrade->remarkDesc = '后续您还可以在系统的后台自定义中进行切换。'; $lang->upgrade->to18Mode['lean'] = '迅捷模式'; -$lang->upgrade->to18Mode['new'] = '综合模式'; \ No newline at end of file +$lang->upgrade->to18Mode['new'] = '综合模式'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 080463f326..c7693ee634 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -7532,15 +7532,15 @@ class upgradeModel extends model /* * Upgrade from classic mode of 15 version to the lite mode of 18 version. * + * @param int $programID * @access public * @return bool */ - public function classic2Lean() + public function classic2Lean($programID) { /* Set project mode as noExecution. */ $this->loadModel('setting')->setItem('system.common.global.projectMode', 'noExecution'); - $programID = $this->createDefaultProgram(); $this->upgradeInProjectMode($programID); return !dao::isError(); @@ -7598,8 +7598,9 @@ class upgradeModel extends model public function upgradeInProjectMode($programID) { $this->loadModel('action'); - $now = helper::now(); - $account = isset($this->app->user->account) ? $this->app->user->account : ''; + $now = helper::now(); + $account = isset($this->app->user->account) ? $this->app->user->account : ''; + $projectMode = $this->setting->getItem('owner=system&module=common§ion=global&key=projectMode'); $noMergedSprints = $this->getNoMergedSprints(); if(!$noMergedSprints) return true; @@ -7624,7 +7625,7 @@ class upgradeModel extends model $project->lastEditedDate = $now; $project->grade = 2; $project->acl = $sprint->acl == 'open' ? 'open' : 'private'; - if($this->config->global->mode == 'classic') $project->noExecution = '1'; + if($projectMode == 'noExecution') $project->noExecution = '1'; $this->dao->insert(TABLE_PROJECT)->data($project)->check('name', 'unique', "type='project' AND parent=$programID AND deleted='0'")->exec(); if(dao::isError()) return false; diff --git a/module/upgrade/view/to18guide.html.php b/module/upgrade/view/to18guide.html.php index a62b6d9136..482c76862a 100644 --- a/module/upgrade/view/to18guide.html.php +++ b/module/upgrade/view/to18guide.html.php @@ -12,7 +12,7 @@ ?>
-
+

@@ -33,53 +33,53 @@
lang->upgrade->program;?>
lang->upgrade->productRR;?>
lang->upgrade->productUR;?>
lang->upgrade->productLine;?>
lang->upgrade->projectScrum;?>
lang->upgrade->projectWaterfull;?>
lang->upgrade->projectKanban;?>
lang->upgrade->execution;?>
lang->upgrade->assetlib;?>
lang->upgrade->oa;?>
lang->upgrade->selectUsage;?>
lang->upgrade->remark;?>lang->upgrade->remarkDesc;?>lang->upgrade->remarkDesc;?>