* Optimize codes.
This commit is contained in:
daitingting
@@ -119,7 +119,7 @@ class programModel extends model
|
||||
if(!empty($append) and is_array($append)) $append = implode(',', $append);
|
||||
$views = empty($append) ? $this->app->user->view->products : $this->app->user->view->products . ",$append";
|
||||
|
||||
$products = $this->dao->select("t1.id, t1.program, CONCAT(IF(t2.name is not null, t2.name, ''), '/', t1.name) AS name")->from(TABLE_PRODUCT)->alias('t1')
|
||||
$products = $this->dao->select("t1.id, t1.program, CONCAT(IF(t2.name IS NOT NULL, t2.name, ''), '/', t1.name) AS name")->from(TABLE_PRODUCT)->alias('t1')
|
||||
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.program = t2.id')
|
||||
->where('t1.deleted')->eq('0')
|
||||
->andWhere('t1.vision')->eq($this->config->vision)
|
||||
|
||||
+68
-68
@@ -1,74 +1,74 @@
|
||||
<?php
|
||||
/* Actions. */
|
||||
$lang->project->createGuide = 'Select Template';
|
||||
$lang->project->index = 'Dashboard';
|
||||
$lang->project->home = 'Home';
|
||||
$lang->project->create = 'Create Project';
|
||||
$lang->project->edit = 'Edit';
|
||||
$lang->project->batchEdit = 'Batch Edit Projects';
|
||||
$lang->project->view = 'Project View';
|
||||
$lang->project->batchEdit = 'Batch Edit Projects';
|
||||
$lang->project->browse = 'Projects';
|
||||
$lang->project->all = 'All';
|
||||
$lang->project->start = 'Start';
|
||||
$lang->project->finish = 'Finish';
|
||||
$lang->project->suspend = 'Suspend';
|
||||
$lang->project->delete = 'Delete';
|
||||
$lang->project->close = 'Close';
|
||||
$lang->project->activate = 'Activate';
|
||||
$lang->project->group = 'Privilege Group';
|
||||
$lang->project->createGroup = 'Create Group';
|
||||
$lang->project->editGroup = 'Edit Group';
|
||||
$lang->project->copyGroup = 'Copy Group';
|
||||
$lang->project->manageView = 'Manage View';
|
||||
$lang->project->managePriv = 'Manage Privilege';
|
||||
$lang->project->manageMembers = 'Manage Team';
|
||||
$lang->project->export = 'Export';
|
||||
$lang->project->addProduct = 'Add product';
|
||||
$lang->project->manageGroupMember = 'Manage Group';
|
||||
$lang->project->moduleSetting = 'List Settings';
|
||||
$lang->project->moduleOpen = 'Program Name';
|
||||
$lang->project->dynamic = 'Dynamic';
|
||||
$lang->project->execution = 'Execution';
|
||||
$lang->project->qa = 'QA';
|
||||
$lang->project->bug = 'Bug List';
|
||||
$lang->project->testcase = 'Case List';
|
||||
$lang->project->testtask = 'Test Task';
|
||||
$lang->project->build = 'Build';
|
||||
$lang->project->updateOrder = 'Order';
|
||||
$lang->project->sort = 'Order';
|
||||
$lang->project->whitelist = 'Project Whitelist';
|
||||
$lang->project->addWhitelist = 'Project Add Whitelist';
|
||||
$lang->project->unbindWhitelist = 'Project Remove Whitelist';
|
||||
$lang->project->manageProducts = 'Manage Products';
|
||||
$lang->project->createGuide = 'Select Template';
|
||||
$lang->project->index = 'Dashboard';
|
||||
$lang->project->home = 'Home';
|
||||
$lang->project->create = 'Create Project';
|
||||
$lang->project->edit = 'Edit';
|
||||
$lang->project->batchEdit = 'Batch Edit Projects';
|
||||
$lang->project->view = 'Project View';
|
||||
$lang->project->batchEdit = 'Batch Edit Projects';
|
||||
$lang->project->browse = 'Projects';
|
||||
$lang->project->all = 'All';
|
||||
$lang->project->start = 'Start';
|
||||
$lang->project->finish = 'Finish';
|
||||
$lang->project->suspend = 'Suspend';
|
||||
$lang->project->delete = 'Delete';
|
||||
$lang->project->close = 'Close';
|
||||
$lang->project->activate = 'Activate';
|
||||
$lang->project->group = 'Privilege Group';
|
||||
$lang->project->createGroup = 'Create Group';
|
||||
$lang->project->editGroup = 'Edit Group';
|
||||
$lang->project->copyGroup = 'Copy Group';
|
||||
$lang->project->manageView = 'Manage View';
|
||||
$lang->project->managePriv = 'Manage Privilege';
|
||||
$lang->project->manageMembers = 'Manage Team';
|
||||
$lang->project->export = 'Export';
|
||||
$lang->project->addProduct = 'Add product';
|
||||
$lang->project->manageGroupMember = 'Manage Group';
|
||||
$lang->project->moduleSetting = 'List Settings';
|
||||
$lang->project->moduleOpen = 'Program Name';
|
||||
$lang->project->dynamic = 'Dynamic';
|
||||
$lang->project->execution = 'Execution';
|
||||
$lang->project->qa = 'QA';
|
||||
$lang->project->bug = 'Bug List';
|
||||
$lang->project->testcase = 'Case List';
|
||||
$lang->project->testtask = 'Test Task';
|
||||
$lang->project->build = 'Build';
|
||||
$lang->project->updateOrder = 'Order';
|
||||
$lang->project->sort = 'Order';
|
||||
$lang->project->whitelist = 'Project Whitelist';
|
||||
$lang->project->addWhitelist = 'Project Add Whitelist';
|
||||
$lang->project->unbindWhitelist = 'Project Remove Whitelist';
|
||||
$lang->project->manageProducts = 'Manage Products';
|
||||
$lang->project->manageOtherProducts = 'Manage Other Products';
|
||||
$lang->project->copyTitle = 'Please select an project to copy';
|
||||
$lang->project->errorSameProducts = 'Project cannot be associated with multiple identical products.';
|
||||
$lang->project->errorSameBranches = 'Project cannot be associated with multiple identical branches.';
|
||||
$lang->project->errorSamePlans = 'Project cannot be associated with multiple identical plans.';
|
||||
$lang->project->errorNoProducts = 'At least one product is associated';
|
||||
$lang->project->copyNoProject = 'There are no items available to copy.';
|
||||
$lang->project->searchByName = 'Enter the project name to search';
|
||||
$lang->project->deleted = 'Gelöscht';
|
||||
$lang->project->linkedProducts = "Linked {$lang->productCommon}s";
|
||||
$lang->project->unlinkedProducts = "Unlinked {$lang->productCommon}s";
|
||||
$lang->project->testreport = 'Testreport';
|
||||
$lang->project->selectProgram = 'Program filtering';
|
||||
$lang->project->teamMember = 'Team Member';
|
||||
$lang->project->unlinkMember = 'Remove Member';
|
||||
$lang->project->copyTeamTitle = 'Select a project team to copy';
|
||||
$lang->project->daysGreaterProject = 'Days cannot be greater than days of project『%s』';
|
||||
$lang->project->errorHours = 'Hours/Day cannot be greater than『24』';
|
||||
$lang->project->workdaysExceed = 'No more than『%s』working days';
|
||||
$lang->project->teamMembersCount = ', there are %s team members.';
|
||||
$lang->project->budgetNumber = '『Budget』must be numbers.';
|
||||
$lang->project->budgetGe0 = '『Budget』must be greater than or equal to 0.';
|
||||
$lang->project->allProjects = 'All Projects';
|
||||
$lang->project->ignore = 'Ignore';
|
||||
$lang->project->manageRepo = 'Manage Repo';
|
||||
$lang->project->linkedRepo = 'Link Repo';
|
||||
$lang->project->unlinkedRepo = 'Unlink Repo';
|
||||
$lang->project->disableExecution = 'Project of disable iteration';
|
||||
$lang->project->copyTitle = 'Please select an project to copy';
|
||||
$lang->project->errorSameProducts = 'Project cannot be associated with multiple identical products.';
|
||||
$lang->project->errorSameBranches = 'Project cannot be associated with multiple identical branches.';
|
||||
$lang->project->errorSamePlans = 'Project cannot be associated with multiple identical plans.';
|
||||
$lang->project->errorNoProducts = 'At least one product is associated';
|
||||
$lang->project->copyNoProject = 'There are no items available to copy.';
|
||||
$lang->project->searchByName = 'Enter the project name to search';
|
||||
$lang->project->deleted = 'Gelöscht';
|
||||
$lang->project->linkedProducts = "Linked {$lang->productCommon}s";
|
||||
$lang->project->unlinkedProducts = "Unlinked {$lang->productCommon}s";
|
||||
$lang->project->testreport = 'Testreport';
|
||||
$lang->project->selectProgram = 'Program filtering';
|
||||
$lang->project->teamMember = 'Team Member';
|
||||
$lang->project->unlinkMember = 'Remove Member';
|
||||
$lang->project->copyTeamTitle = 'Select a project team to copy';
|
||||
$lang->project->daysGreaterProject = 'Days cannot be greater than days of project『%s』';
|
||||
$lang->project->errorHours = 'Hours/Day cannot be greater than『24』';
|
||||
$lang->project->workdaysExceed = 'No more than『%s』working days';
|
||||
$lang->project->teamMembersCount = ', there are %s team members.';
|
||||
$lang->project->budgetNumber = '『Budget』must be numbers.';
|
||||
$lang->project->budgetGe0 = '『Budget』must be greater than or equal to 0.';
|
||||
$lang->project->allProjects = 'All Projects';
|
||||
$lang->project->ignore = 'Ignore';
|
||||
$lang->project->manageRepo = 'Manage Repo';
|
||||
$lang->project->linkedRepo = 'Link Repo';
|
||||
$lang->project->unlinkedRepo = 'Unlink Repo';
|
||||
$lang->project->disableExecution = 'Project of disable iteration';
|
||||
$lang->project->selectProduct = 'Select Product';
|
||||
|
||||
/* Fields. */
|
||||
|
||||
@@ -2317,6 +2317,7 @@ class projectModel extends model
|
||||
|
||||
$members = array_keys($this->getTeamMembers($projectID));
|
||||
|
||||
/* Link products of other programs. */
|
||||
if($_POST['otherProducts'])
|
||||
{
|
||||
$products = array();
|
||||
@@ -2351,6 +2352,7 @@ class projectModel extends model
|
||||
return !dao::isError();
|
||||
}
|
||||
|
||||
/* Link products of current program of the project. */
|
||||
$products = isset($_POST['products']) ? $_POST['products'] : $products;
|
||||
$oldProjectProducts = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('project')->eq((int)$projectID)->fetchGroup('product', 'branch');
|
||||
|
||||
|
||||
Reference in New Issue
Block a user