From ba5bf6720a4b402352248a3a8fc2636a576b65ff Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 5 Mar 2021 17:26:02 +0800 Subject: [PATCH] * Rename doc var. --- db/update15.0.sql | 1 + db/zentao.sql | 1 + module/doc/config.php | 4 +- module/doc/control.php | 103 +++++++++++++++++++------------------- module/doc/lang/de.php | 20 ++++---- module/doc/lang/en.php | 20 ++++---- module/doc/lang/fr.php | 20 ++++---- module/doc/lang/vi.php | 20 ++++---- module/doc/lang/zh-cn.php | 24 ++++----- 9 files changed, 108 insertions(+), 105 deletions(-) diff --git a/db/update15.0.sql b/db/update15.0.sql index c33c43fed8..5c2bb72428 100644 --- a/db/update15.0.sql +++ b/db/update15.0.sql @@ -37,6 +37,7 @@ ALTER TABLE `zt_testtask` CHANGE `project` `execution` mediumint(8) unsigned NOT ALTER TABLE `zt_webhook` CHANGE `projects` `executions` mediumint(8) unsigned NOT NULL; ALTER TABLE `zt_task` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`; +ALTER TABLE `zt_doclib` ADD `project` mediumint(8) unsigned NOT NULL AFTER `product`; ALTER TABLE `zt_doc` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`; ALTER TABLE `zt_story` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`; ALTER TABLE `zt_bug` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`; diff --git a/db/zentao.sql b/db/zentao.sql index 987fe80b2f..9ab34576cb 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -377,6 +377,7 @@ CREATE TABLE IF NOT EXISTS `zt_doclib` ( `id` smallint(5) unsigned NOT NULL auto_increment, `type` varchar(30) NOT NULL, `product` mediumint(8) unsigned NOT NULL, + `project` mediumint(8) unsigned NOT NULL, `execution` mediumint(8) unsigned NOT NULL, `name` varchar(60) NOT NULL, `acl` varchar(10) NOT NULL DEFAULT 'open', diff --git a/module/doc/config.php b/module/doc/config.php index e6807e4a7c..9300f4c4c0 100644 --- a/module/doc/config.php +++ b/module/doc/config.php @@ -32,7 +32,7 @@ $config->doc->search['module'] = 'doc'; $config->doc->search['fields']['title'] = $lang->doc->title; $config->doc->search['fields']['id'] = $lang->doc->id; $config->doc->search['fields']['product'] = $lang->doc->product; -$config->doc->search['fields']['project'] = $lang->doc->project; +$config->doc->search['fields']['execution'] = $lang->doc->execution; $config->doc->search['fields']['lib'] = $lang->doc->lib; $config->doc->search['fields']['module'] = $lang->doc->module; $config->doc->search['fields']['keywords'] = $lang->doc->keywords; @@ -46,7 +46,7 @@ $config->doc->search['params']['title'] = array('operator' => 'include', $config->doc->search['params']['keywords'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); $config->doc->search['params']['product'] = array('operator' => '=', 'control' => 'select', 'values' => ''); $config->doc->search['params']['module'] = array('operator' => 'belong', 'control' => 'select', 'values' => ''); -$config->doc->search['params']['project'] = array('operator' => '=', 'control' => 'select', 'values' => ''); +$config->doc->search['params']['execution'] = array('operator' => '=', 'control' => 'select', 'values' => ''); $config->doc->search['params']['lib'] = array('operator' => '=', 'control' => 'select', 'values' => '' ); $config->doc->search['params']['addedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); $config->doc->search['params']['addedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date'); diff --git a/module/doc/control.php b/module/doc/control.php index d8ce9663f7..92c9fc50be 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -25,10 +25,11 @@ class doc extends control $this->loadModel('action'); $this->loadModel('product'); $this->loadModel('project'); + $this->loadModel('execution'); $this->from = $this->cookie->from ? $this->cookie->from : 'doc'; $this->productID = $this->cookie->product ? $this->cookie->product : '0'; - $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0; - if($this->from == 'doc') $this->session->set('PRJ', ''); + $this->projectID = isset($_GET['project']) ? $_GET['project'] : 0; + if($this->from == 'doc') $this->session->set('project', ''); if(!$this->projectID) $this->lang->navGroup->doc = 'doc'; } @@ -63,7 +64,7 @@ class doc extends control $this->view->myDocs = $this->doc->getDocsByBrowseType(0, 'openedbyme', 0, 0, 'addedDate_desc', $pager); $this->view->statisticInfo = $this->doc->getStatisticInfo(); $this->view->users = $this->user->getPairs('noletter'); - $this->view->doingProjects = $this->project->getExecutionsByProject($this->projectID, 'undone', 5); + $this->view->doingExecutions = $this->execution->getByProject($this->projectID, 'undone', 5); $this->display(); } @@ -71,11 +72,12 @@ class doc extends control /** * Browse docs. * - * @param string|int $libID product|project or the int id of custom library + * @param string|int $libID product|execution or the int id of custom library * @param int $moduleID * @param int $productID - * @param int $projectID + * @param int $executionID * @param string $orderBy + * @param string $from doc|project|product * @param int $recTotal * @param int $recPerPage * @param int $pageID @@ -95,16 +97,16 @@ class doc extends control $moduleID = ($browseType == 'bymodule') ? (int)$param : 0; $type = ''; - $productID = 0; - $projectID = 0; + $productID = 0; + $executionID = 0; if($libID) { - $lib = $this->doc->getLibByID($libID); - $type = $lib->type; - $productID = $lib->product; - $projectID = $lib->project; + $lib = $this->doc->getLibByID($libID); + $type = $lib->type; + $productID = $lib->product; + $executionID = $lib->execution; - if($type != 'product' and $type != 'project') $from = 'doc'; + if($type != 'product' and $type != 'execution') $from = 'doc'; } $this->libs = $this->doc->getLibs($type, '', $libID); @@ -126,13 +128,12 @@ class doc extends control $this->lang->doc->menu = $this->lang->project->menu; $this->lang->doc->menuOrder = $this->lang->project->menuOrder; if($this->config->systemMode == 'classic') $this->lang->noMenuModule[] = 'doc'; - $this->project->setMenu($this->project->getExecutionsByProject($this->session->PRJ, 'all', 0, true), $lib->project); - $this->lang->set('menugroup.doc', 'project'); + $this->project->setMenu($this->project->getPairs($this->session->project, 'all', 0, true), $lib->project); } else { $menuType = (!$type && (in_array($browseType, array_keys($this->lang->doc->fastMenuList)) || $browseType == 'bysearch')) ? $browseType : $type; - $this->doc->setMenu($menuType, $libID, $moduleID, $productID, $projectID); + $this->doc->setMenu($menuType, $libID, $moduleID, $productID, $executionID); } $this->session->set('docList', $this->app->getURI(true)); @@ -176,14 +177,14 @@ class doc extends control } $attachLibs = array(); - if(!empty($lib) and (!empty($lib->product) or !empty($lib->project)) and $browseType != 'bymodule') + if(!empty($lib) and (!empty($lib->product) or !empty($lib->execution)) and $browseType != 'bymodule') { - $count = $this->dao->select('count(*) as count')->from(TABLE_DOCLIB)->where('project')->eq($lib->project)->andWhere('product')->eq($lib->product)->fetch('count'); + $count = $this->dao->select('count(*) as count')->from(TABLE_DOCLIB)->where('execution')->eq($lib->execution)->andWhere('product')->eq($lib->product)->fetch('count'); if($count == 1 and $type and isset($lib->$type)) { $objectLibs = $this->doc->getLibsByObject($type, $lib->$type); - if(isset($objectLibs['project'])) $attachLibs['project'] = $objectLibs['project']; - if(isset($objectLibs['files'])) $attachLibs['files'] = $objectLibs['files']; + if(isset($objectLibs['execution'])) $attachLibs['execution'] = $objectLibs['execution']; + if(isset($objectLibs['files'])) $attachLibs['files'] = $objectLibs['files']; } } @@ -230,18 +231,18 @@ class doc extends control } } - $projectID = $this->session->PRJ; - $products = $this->product->getProductPairsByProject($projectID, 'noclosed'); - $projects = $this->project->getExecutionsByProject($projectID, 'all', 0, true); + $projectID = $this->session->project; + $products = $this->product->getProductPairsByProject($projectID, 'noclosed'); + $executions = $this->execution->getByProject($projectID, 'all', 0, true); $libTypeList = $this->lang->doc->libTypeList; - if(empty($products)) unset($libTypeList['product']); - if(empty($projects)) unset($libTypeList['project']); + if(empty($products)) unset($libTypeList['product']); + if(empty($executions)) unset($libTypeList['execution']); $this->view->groups = $this->loadModel('group')->getPairs(); $this->view->users = $this->user->getPairs('nocode'); $this->view->products = $products; - $this->view->projects = $projects; + $this->view->executions = $executions; $this->view->type = $type; $this->view->libTypeList = $libTypeList; $this->view->objectID = $objectID; @@ -270,8 +271,8 @@ class doc extends control } $lib = $this->doc->getLibByID($libID); - if(!empty($lib->product)) $this->view->product = $this->dao->select('id,name')->from(TABLE_PRODUCT)->where('id')->eq($lib->product)->fetch(); - if(!empty($lib->project)) $this->view->project = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('id')->eq($lib->project)->fetch(); + if(!empty($lib->product)) $this->view->product = $this->dao->select('id,name')->from(TABLE_PRODUCT)->where('id')->eq($lib->product)->fetch(); + if(!empty($lib->execution)) $this->view->execution = $this->dao->select('id,name')->from(TABLE_EXECUTION)->where('id')->eq($lib->execution)->fetch(); $this->view->lib = $lib; $this->view->groups = $this->loadModel('group')->getPairs(); $this->view->users = $this->user->getPairs('noletter', $lib->users); @@ -290,7 +291,7 @@ class doc extends control */ public function deleteLib($libID, $confirm = 'no') { - if($libID == 'product' or $libID == 'project') die(); + if($libID == 'product' or $libID == 'execution') die(); if($confirm == 'no') { die(js::confirm($this->lang->doc->confirmDeleteLib, $this->createLink('doc', 'deleteLib', "libID=$libID&confirm=yes"))); @@ -363,14 +364,14 @@ class doc extends control $this->lang->doc->menu = $this->lang->project->menu; $this->lang->doc->menuOrder = $this->lang->project->menuOrder; if($this->config->systemMode == 'classic') $this->lang->noMenuModule[] = 'doc'; - $this->project->setMenu($this->project->getExecutionsByProject($this->session->PRJ, 'all', 0, true), $lib->project); + $this->project->setMenu($this->project->getPairs($this->session->project, 'all', 0, true), $lib->project); $this->lang->set('menugroup.doc', 'project'); $this->lang->TRActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), " " . $this->lang->doc->createlib, '', "class='btn btn-secondary iframe' data-width='70%'") : ''; } else { - $this->doc->setMenu($type, $libID, $moduleID, $lib->product, $lib->project); + $this->doc->setMenu($type, $libID, $moduleID, $lib->product, $lib->execution); } $this->view->title = $lib->name . $this->lang->colon . $this->lang->doc->create; @@ -455,7 +456,7 @@ class doc extends control } else { - $this->doc->setMenu($type, $libID, $doc->module, $lib->product, $lib->project); + $this->doc->setMenu($type, $libID, $doc->module, $lib->product, $lib->execution); } $this->view->title = $lib->name . $this->lang->colon . $this->lang->doc->edit; @@ -516,13 +517,13 @@ class doc extends control $this->lang->doc->menu = $this->lang->project->menu; $this->lang->doc->menuOrder = $this->lang->project->menuOrder; if($this->config->systemMode == 'classic') $this->lang->noMenuModule[] = 'doc'; - $this->project->setMenu($this->project->getExecutionsByProject($this->session->PRJ, 'all', 0, true), $objectID); + $this->project->setMenu($this->project->getPairs($this->session->project, 'all', 0, true), $objectID); $this->lang->set('menugroup.doc', 'project'); } else { /* Set menu. */ - $this->doc->setMenu($type, $doc->lib, $doc->module, $lib->product, $lib->project); + $this->doc->setMenu($type, $doc->lib, $doc->module, $lib->product, $lib->execution); } $this->view->title = "DOC #$doc->id $doc->title - " . $lib->name; @@ -770,12 +771,12 @@ class doc extends control $libName = $this->lang->doc->libTypeList[$type]; $crumb = html::a(inlink('allLibs', "type=$type&product=$product"), $libName); - if($product and $type == 'project') $crumb = $this->doc->getProductCrumb($product); + if($product and $type == 'executionCommon') $crumb = $this->doc->getProductCrumb($product); $this->view->title = $libName; $this->view->position[] = $libName; - $this->doc->setMenu($type, $libID = 0, $moduleID = 0, $productID = 0, $projectID = 0, $crumb); + $this->doc->setMenu($type, $libID = 0, $moduleID = 0, $productID = 0, $executionID = 0, $crumb); /* Load pager. */ $this->app->loadClass('pager', $static = true); @@ -783,7 +784,7 @@ class doc extends control $libs = $this->doc->getAllLibsByType($type, $pager); $subLibs = array(); - if($type == 'product' or $type == 'project') + if($type == 'product' or $type == 'execution') { $subLibs = $this->doc->getSubLibGroups($type, array_keys($libs)); if($this->cookie->browseType == 'bylist') $this->view->users = $this->user->getPairs('noletter'); @@ -803,7 +804,7 @@ class doc extends control } /** - * Show files for product or project. + * Show files for product or execution. * * @param string $type * @param int $objectID @@ -846,31 +847,31 @@ class doc extends control $this->lang->doc->menu = $this->lang->project->menu; $this->lang->doc->menuOrder = $this->lang->project->menuOrder; if($this->config->systemMode == 'classic') $this->lang->noMenuModule[] = 'doc'; - $this->project->setMenu($this->project->getExecutionsByProject($this->session->PRJ, 'all', 0, true), $objectID); + $this->project->setMenu($this->project->getPairs($this->session->project, 'all', 0, true), $objectID); $this->lang->set('menugroup.doc', 'project'); } else { $crumb = html::a(inlink('allLibs', "type=$type"), $type == 'product' ? $this->lang->productCommon : $this->lang->executionCommon) . $this->lang->doc->separator; - if($this->productID and $type == 'project') $crumb = $this->doc->getProductCrumb($this->productID, $objectID); + if($this->productID and $type == 'execution') $crumb = $this->doc->getProductCrumb($this->productID, $objectID); $crumb .= html::a(inlink('objectLibs', "type=$type&objectID=$objectID"), $object->name); $crumb .= $this->lang->doc->separator . ' ' . $this->lang->doclib->files; - $productID = 0; - $projectID = 0; + $productID = 0; + $executionID = 0; if($type == 'product') { $productID = $objectID; if(!$this->product->checkPriv($objectID)) $this->accessDenied(); } - if($type == 'project') + if($type == 'execution') { - $projectID = $objectID; - if(!$this->project->checkPriv($objectID)) $this->accessDenied(); + $executionID = $objectID; + if(!$this->executionID->checkPriv($objectID)) $this->accessDenied(); } - $this->doc->setMenu($type, $libID = 0, $moduleID = 0, $productID, $projectID, $crumb); + $this->doc->setMenu($type, $libID = 0, $moduleID = 0, $productID, $executionID, $crumb); } /* Load pager. */ @@ -912,7 +913,7 @@ class doc extends control } /** - * Show libs for product or project + * Show libs for product or execution. * * @param string $type * @param int $objectID @@ -946,17 +947,17 @@ class doc extends control $this->lang->doc->menu = $this->lang->project->menu; $this->lang->doc->menuOrder = $this->lang->project->menuOrder; if($this->config->systemMode == 'classic') $this->lang->noMenuModule[] = 'doc'; - $this->project->setMenu($this->project->getExecutionsByProject($this->session->PRJ, 'all', 0, true), $objectID); + $this->project->setMenu($this->project->getPairs($this->session->project, 'all', 0, true), $objectID); $this->lang->set('menugroup.doc', 'project'); } else { $crumb = html::a(inlink('allLibs', "type=$type"), $type == 'product' ? $this->lang->productCommon : $this->lang->executionCommon) . $this->lang->doc->separator; - if($this->productID and $type == 'project') $crumb = $this->doc->getProductCrumb($this->productID, $objectID); + if($this->productID and $type == 'execution') $crumb = $this->doc->getProductCrumb($this->productID, $objectID); $crumb .= html::a(inlink('objectLibs', "type=$type&objectID=$objectID"), $object->name); - $productID = $type == 'product' ? $objectID : 0; - $projectID = $type == 'project' ? $objectID : 0; - $this->doc->setMenu($type, 0, 0, $productID, $projectID, $crumb); + $productID = $type == 'product' ? $objectID : 0; + $executionID = $type == 'execution' ? $objectID : 0; + $this->doc->setMenu($type, 0, 0, $productID, $executionID, $crumb); } /* Set Custom. */ diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php index 39e47c393f..056318af06 100644 --- a/module/doc/lang/de.php +++ b/module/doc/lang/de.php @@ -13,7 +13,7 @@ $lang->doc->common = 'Dok'; $lang->doc->id = 'ID'; $lang->doc->product = $lang->productCommon; -$lang->doc->project = $lang->executionCommon; +$lang->doc->execution = $lang->executionCommon; $lang->doc->lib = 'Bibliothek'; $lang->doc->module = 'Modul'; $lang->doc->title = 'Titel'; @@ -100,15 +100,15 @@ $lang->doc->allProduct = 'Alle' . $lang->productCommon; $lang->doc->allProject = 'Alle' . $lang->executionCommon; $lang->doc->libTypeList['product'] = $lang->productCommon . ' Bibliothek'; -$lang->doc->libTypeList['project'] = $lang->executionCommon . ' Bibliothek'; +$lang->doc->libTypeList['execution'] = $lang->executionCommon . ' Bibliothek'; $lang->doc->libTypeList['custom'] = 'Eigene Bibliothek'; $lang->doc->libIconList['product'] = 'icon-cube'; -$lang->doc->libIconList['project'] = 'icon-stack'; +$lang->doc->libIconList['execution'] = 'icon-stack'; $lang->doc->libIconList['custom'] = 'icon-folder-o'; $lang->doc->systemLibs['product'] = $lang->productCommon . 'Dok Bibliothek'; -$lang->doc->systemLibs['project'] = $lang->executionCommon . 'Dok Bibliothek'; +$lang->doc->systemLibs['execution'] = $lang->executionCommon . 'Dok Bibliothek'; $lang->doc->aclList['open'] = 'Öffentlich'; $lang->doc->aclList['custom'] = 'Eigene'; @@ -175,8 +175,8 @@ $lang->doc->errorEmptyLib = 'No data in document library.'; $lang->doc->noticeAcl['lib']['product']['default'] = 'Users who can access the selected product can access it.'; $lang->doc->noticeAcl['lib']['product']['custom'] = 'Users who can access the selected product or users in the whiltelist can access it.'; -$lang->doc->noticeAcl['lib']['project']['default'] = 'Users who can access the selected project can access it.'; -$lang->doc->noticeAcl['lib']['project']['custom'] = 'Users who can access the selected project or users in the whiltelist can access it.'; +$lang->doc->noticeAcl['lib']['execution']['default'] = 'Users who can access the selected execution can access it.'; +$lang->doc->noticeAcl['lib']['execution']['custom'] = 'Users who can access the selected execution or users in the whiltelist can access it.'; $lang->doc->noticeAcl['lib']['custom']['open'] = 'All users can access it.'; $lang->doc->noticeAcl['lib']['custom']['custom'] = 'Users in the whitelist can access it.'; $lang->doc->noticeAcl['lib']['custom']['private'] = 'Only the one who created it can access it.'; @@ -196,7 +196,7 @@ $lang->doclib->user = 'Benutzer'; $lang->doclib->files = 'Dateien'; $lang->doclib->all = 'Alle Bibliotheken'; $lang->doclib->select = 'Auswahl'; -$lang->doclib->project = $lang->executionCommon . ' Bibliothek'; +$lang->doclib->execution = $lang->executionCommon . ' Bibliothek'; $lang->doclib->product = $lang->productCommon . ' Bibliothek'; $lang->doclib->aclListA['default'] = 'Default'; @@ -207,14 +207,14 @@ $lang->doclib->aclListB['custom'] = 'Custom'; $lang->doclib->aclListB['private'] = 'Private'; $lang->doclib->create['product'] = 'Create ' . $lang->productCommon . ' Library'; -$lang->doclib->create['project'] = 'Create ' . $lang->executionCommon . ' Library'; +$lang->doclib->create['execution'] = 'Create ' . $lang->executionCommon . ' Library'; $lang->doclib->create['custom'] = 'Create Custom Library'; $lang->doclib->main['product'] = 'Primary Library'; -$lang->doclib->main['project'] = 'Primary Library'; +$lang->doclib->main['execution'] = 'Primary Library'; $lang->doclib->tabList['product'] = $lang->productCommon; -$lang->doclib->tabList['project'] = $lang->executionCommon; +$lang->doclib->tabList['execution'] = $lang->executionCommon; $lang->doclib->tabList['custom'] = 'Custom'; $lang->doclib->nameList['custom'] = 'Custom Name'; diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index cf54ed5b8a..d1ace76b55 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -13,7 +13,7 @@ $lang->doc->common = 'Document'; $lang->doc->id = 'ID'; $lang->doc->product = $lang->productCommon; -$lang->doc->project = $lang->executionCommon; +$lang->doc->execution = $lang->executionCommon; $lang->doc->lib = 'Library'; $lang->doc->module = 'Category'; $lang->doc->title = 'Name'; @@ -100,15 +100,15 @@ $lang->doc->allProduct = 'All' . $lang->productCommon . 's'; $lang->doc->allProject = 'All' . $lang->executionCommon . 's'; $lang->doc->libTypeList['product'] = $lang->productCommon . ' Library'; -$lang->doc->libTypeList['project'] = $lang->executionCommon . ' Library'; +$lang->doc->libTypeList['execution'] = $lang->executionCommon . ' Library'; $lang->doc->libTypeList['custom'] = 'Custom Library'; $lang->doc->libIconList['product'] = 'icon-cube'; -$lang->doc->libIconList['project'] = 'icon-stack'; +$lang->doc->libIconList['execution'] = 'icon-stack'; $lang->doc->libIconList['custom'] = 'icon-folder-o'; $lang->doc->systemLibs['product'] = $lang->productCommon; -$lang->doc->systemLibs['project'] = $lang->executionCommon; +$lang->doc->systemLibs['execution'] = $lang->executionCommon; $lang->doc->aclList['open'] = 'Public'; $lang->doc->aclList['custom'] = 'Custom'; @@ -175,8 +175,8 @@ $lang->doc->errorEmptyLib = 'No data in document library.'; $lang->doc->noticeAcl['lib']['product']['default'] = 'Users who can access the selected product can access it.'; $lang->doc->noticeAcl['lib']['product']['custom'] = 'Users who can access the selected product or users in the whiltelist can access it.'; -$lang->doc->noticeAcl['lib']['project']['default'] = 'Users who can access the selected project can access it.'; -$lang->doc->noticeAcl['lib']['project']['custom'] = 'Users who can access the selected project or users in the whiltelist can access it.'; +$lang->doc->noticeAcl['lib']['execution']['default'] = 'Users who can access the selected execution can access it.'; +$lang->doc->noticeAcl['lib']['execution']['custom'] = 'Users who can access the selected execution or users in the whiltelist can access it.'; $lang->doc->noticeAcl['lib']['custom']['open'] = 'All users can access it.'; $lang->doc->noticeAcl['lib']['custom']['custom'] = 'Users in the whitelist can access it.'; $lang->doc->noticeAcl['lib']['custom']['private'] = 'Only the one who created it can access it.'; @@ -196,7 +196,7 @@ $lang->doclib->user = 'User'; $lang->doclib->files = 'Attachments'; $lang->doclib->all = 'All Libraries'; $lang->doclib->select = 'Select'; -$lang->doclib->project = $lang->executionCommon . ' Library'; +$lang->doclib->execution = $lang->executionCommon . ' Library'; $lang->doclib->product = $lang->productCommon . ' Library'; $lang->doclib->aclListA['default'] = 'Default'; @@ -207,14 +207,14 @@ $lang->doclib->aclListB['custom'] = 'Custom'; $lang->doclib->aclListB['private'] = 'Private'; $lang->doclib->create['product'] = 'Create ' . $lang->productCommon . ' Library'; -$lang->doclib->create['project'] = 'Create ' . $lang->executionCommon . ' Library'; +$lang->doclib->create['execution'] = 'Create ' . $lang->executionCommon . ' Library'; $lang->doclib->create['custom'] = 'Create Custom Library'; $lang->doclib->main['product'] = 'Primary Library'; -$lang->doclib->main['project'] = 'Primary Library'; +$lang->doclib->main['execution'] = 'Primary Library'; $lang->doclib->tabList['product'] = $lang->productCommon; -$lang->doclib->tabList['project'] = $lang->executionCommon; +$lang->doclib->tabList['execution'] = $lang->executionCommon; $lang->doclib->tabList['custom'] = 'Custom'; $lang->doclib->nameList['custom'] = 'Custom Name'; diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php index b44b051cf3..59b09df956 100644 --- a/module/doc/lang/fr.php +++ b/module/doc/lang/fr.php @@ -13,7 +13,7 @@ $lang->doc->common = 'Gestion Documentaire'; $lang->doc->id = 'ID'; $lang->doc->product = $lang->productCommon; -$lang->doc->project = $lang->executionCommon; +$lang->doc->execution = $lang->executionCommon; $lang->doc->lib = 'Bibliothèque'; $lang->doc->module = 'Catégorie'; $lang->doc->title = 'Nom'; @@ -100,15 +100,15 @@ $lang->doc->allProduct = 'Tous les ' . $lang->productCommon . 's'; $lang->doc->allProject = 'Tous les ' . $lang->executionCommon . 's'; $lang->doc->libTypeList['product'] = $lang->productCommon . ' Library'; -$lang->doc->libTypeList['project'] = 'Bibliothèque ' . $lang->executionCommon; +$lang->doc->libTypeList['execution'] = 'Bibliothèque ' . $lang->executionCommon; $lang->doc->libTypeList['custom'] = 'Bib. Personnalisée'; $lang->doc->libIconList['product'] = 'icon-cube'; -$lang->doc->libIconList['project'] = 'icon-stack'; +$lang->doc->libIconList['execution'] = 'icon-stack'; $lang->doc->libIconList['custom'] = 'icon-folder-o'; $lang->doc->systemLibs['product'] = $lang->productCommon; -$lang->doc->systemLibs['project'] = $lang->executionCommon; +$lang->doc->systemLibs['execution'] = $lang->executionCommon; $lang->doc->aclList['open'] = 'Public'; $lang->doc->aclList['custom'] = 'Person.'; @@ -175,8 +175,8 @@ $lang->doc->errorEmptyLib = 'No data in document library.'; $lang->doc->noticeAcl['lib']['product']['default'] = 'Les utilisateurs qui ont accès au Product peuvent y accéder.'; $lang->doc->noticeAcl['lib']['product']['custom'] = 'Les utilisateurs qui ont accès au Product ou les utilisateurs de la Liste Blanche peuvent y accéder.'; -$lang->doc->noticeAcl['lib']['project']['default'] = 'Les utilisateurs qui ont accès au Projet peuvent y accéder.'; -$lang->doc->noticeAcl['lib']['project']['custom'] = 'Les utilisateurs qui ont accès au Projet ou les utilisateurs de la Liste Blanche peuvent y accéder.'; +$lang->doc->noticeAcl['lib']['execution']['default'] = 'Les utilisateurs qui ont accès au Projet peuvent y accéder.'; +$lang->doc->noticeAcl['lib']['execution']['custom'] = 'Les utilisateurs qui ont accès au Projet ou les utilisateurs de la Liste Blanche peuvent y accéder.'; $lang->doc->noticeAcl['lib']['custom']['open'] = 'Tous les utilisateurs peuvent y accéder.'; $lang->doc->noticeAcl['lib']['custom']['custom'] = 'Les utilisateurs de la Liste Blanche peuvent y accéder.'; $lang->doc->noticeAcl['lib']['custom']['private'] = 'Seulement le créateur de la Bibliothèque peut y accéder.'; @@ -196,7 +196,7 @@ $lang->doclib->user = 'Utilisateur'; $lang->doclib->files = 'Pièces Jointes'; $lang->doclib->all = 'Toutes les Libraries'; $lang->doclib->select = 'Sélect.'; -$lang->doclib->project = 'Bibliothèque ' . $lang->executionCommon; +$lang->doclib->execution = 'Bibliothèque ' . $lang->executionCommon; $lang->doclib->product = $lang->productCommon . ' Library'; $lang->doclib->aclListA['default'] = 'Défaut'; @@ -207,14 +207,14 @@ $lang->doclib->aclListB['custom'] = 'Person.'; $lang->doclib->aclListB['private'] = 'Privée'; $lang->doclib->create['product'] = 'Créer ' . $lang->productCommon . ' Library'; -$lang->doclib->create['project'] = 'Créer ' . 'Bibliothèque ' . $lang->executionCommon; +$lang->doclib->create['execution'] = 'Créer ' . 'Bibliothèque ' . $lang->executionCommon; $lang->doclib->create['custom'] = 'Créer Bibliothèque Personnelle'; $lang->doclib->main['product'] = 'Bibliothèque Principale'; -$lang->doclib->main['project'] = 'Bibliothèque Principale'; +$lang->doclib->main['execution'] = 'Bibliothèque Principale'; $lang->doclib->tabList['product'] = $lang->productCommon; -$lang->doclib->tabList['project'] = $lang->executionCommon; +$lang->doclib->tabList['execution'] = $lang->executionCommon; $lang->doclib->tabList['custom'] = 'Personnelle'; $lang->doclib->nameList['custom'] = 'Nom personnalisé'; diff --git a/module/doc/lang/vi.php b/module/doc/lang/vi.php index e38a422a8a..493d7dff2a 100644 --- a/module/doc/lang/vi.php +++ b/module/doc/lang/vi.php @@ -13,7 +13,7 @@ $lang->doc->common = 'Tài liệu'; $lang->doc->id = 'ID'; $lang->doc->product = $lang->productCommon; -$lang->doc->project = $lang->executionCommon; +$lang->doc->execution = $lang->executionCommon; $lang->doc->lib = 'Thư viện'; $lang->doc->module = 'Danh mục'; $lang->doc->title = 'Tên'; @@ -100,15 +100,15 @@ $lang->doc->allProduct = 'All' . $lang->productCommon; $lang->doc->allProject = 'All' . $lang->executionCommon; $lang->doc->libTypeList['product'] = $lang->productCommon . ' thư viện'; -$lang->doc->libTypeList['project'] = $lang->executionCommon . ' thư viện'; +$lang->doc->libTypeList['execution'] = $lang->executionCommon . ' thư viện'; $lang->doc->libTypeList['custom'] = 'Tùy biến thư viện'; $lang->doc->libIconList['product'] = 'icon-cube'; -$lang->doc->libIconList['project'] = 'icon-stack'; +$lang->doc->libIconList['execution'] = 'icon-stack'; $lang->doc->libIconList['custom'] = 'icon-folder-o'; $lang->doc->systemLibs['product'] = $lang->productCommon; -$lang->doc->systemLibs['project'] = $lang->executionCommon; +$lang->doc->systemLibs['execution'] = $lang->executionCommon; $lang->doc->aclList['open'] = 'Công khai'; $lang->doc->aclList['custom'] = 'Tùy biến'; @@ -175,8 +175,8 @@ $lang->doc->errorEmptyLib = 'No data in document library.'; $lang->doc->noticeAcl['lib']['product']['default'] = 'Users who can access the selected product có thể truy cập nó.'; $lang->doc->noticeAcl['lib']['product']['custom'] = 'Users who can access the selected product or users in the whiltelist có thể truy cập nó.'; -$lang->doc->noticeAcl['lib']['project']['default'] = 'Users who can access the selected project có thể truy cập nó.'; -$lang->doc->noticeAcl['lib']['project']['custom'] = 'Users who can access the selected project or users in the whiltelist có thể truy cập nó.'; +$lang->doc->noticeAcl['lib']['execution']['default'] = 'Users who can access the selected execution có thể truy cập nó.'; +$lang->doc->noticeAcl['lib']['execution']['custom'] = 'Users who can access the selected execution or users in the whiltelist có thể truy cập nó.'; $lang->doc->noticeAcl['lib']['custom']['open'] = 'Tất cả users có thể truy cập nó.'; $lang->doc->noticeAcl['lib']['custom']['custom'] = 'Users in the whitelist có thể truy cập nó.'; $lang->doc->noticeAcl['lib']['custom']['private'] = 'Chỉ the one who created it có thể truy cập nó.'; @@ -196,7 +196,7 @@ $lang->doclib->user = 'Người dùng'; $lang->doclib->files = 'Attachments'; $lang->doclib->all = 'Tất cả Libraries'; $lang->doclib->select = 'Chọn'; -$lang->doclib->project = $lang->executionCommon . ' thư viện'; +$lang->doclib->execution = $lang->executionCommon . ' thư viện'; $lang->doclib->product = $lang->productCommon . ' thư viện'; $lang->doclib->aclListA['default'] = 'Mặc định'; @@ -207,14 +207,14 @@ $lang->doclib->aclListB['custom'] = 'Tùy biến'; $lang->doclib->aclListB['private'] = 'Riêng tư'; $lang->doclib->create['product'] = 'Tạo ' . $lang->productCommon . ' thư viện'; -$lang->doclib->create['project'] = 'Tạo ' . $lang->executionCommon . ' thư viện'; +$lang->doclib->create['execution'] = 'Tạo ' . $lang->executionCommon . ' thư viện'; $lang->doclib->create['custom'] = 'Tạo Custom thư viện'; $lang->doclib->main['product'] = 'Primary thư viện'; -$lang->doclib->main['project'] = 'Primary thư viện'; +$lang->doclib->main['execution'] = 'Primary thư viện'; $lang->doclib->tabList['product'] = $lang->productCommon; -$lang->doclib->tabList['project'] = $lang->executionCommon; +$lang->doclib->tabList['execution'] = $lang->executionCommon; $lang->doclib->tabList['custom'] = 'Tùy biến'; $lang->doclib->nameList['custom'] = 'Tùy biến tên'; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index 935bc6d7c9..9c49bebcb7 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -13,7 +13,7 @@ $lang->doc->common = '文档'; $lang->doc->id = '文档编号'; $lang->doc->product = '所属' . $lang->productCommon; -$lang->doc->project = '所属' . $lang->executionCommon; +$lang->doc->execution = '所属' . $lang->executionCommon; $lang->doc->lib = '所属文档库'; $lang->doc->module = '所属分类'; $lang->doc->title = '文档标题'; @@ -99,16 +99,16 @@ $lang->doc->search = '搜索'; $lang->doc->allProduct = '所有' . $lang->productCommon; $lang->doc->allProject = '所有' . $lang->executionCommon; -$lang->doc->libTypeList['product'] = $lang->productCommon . '文档库'; -$lang->doc->libTypeList['project'] = $lang->executionCommon . '文档库'; -$lang->doc->libTypeList['custom'] = '自定义文档库'; +$lang->doc->libTypeList['product'] = $lang->productCommon . '文档库'; +$lang->doc->libTypeList['execution'] = $lang->executionCommon . '文档库'; +$lang->doc->libTypeList['custom'] = '自定义文档库'; $lang->doc->libIconList['product'] = 'icon-cube'; -$lang->doc->libIconList['project'] = 'icon-stack'; +$lang->doc->libIconList['execution'] = 'icon-stack'; $lang->doc->libIconList['custom'] = 'icon-folder-o'; $lang->doc->systemLibs['product'] = $lang->productCommon; -$lang->doc->systemLibs['project'] = $lang->executionCommon; +$lang->doc->systemLibs['execution'] = $lang->executionCommon; $lang->doc->aclList['open'] = '公开'; $lang->doc->aclList['custom'] = '自定义'; @@ -175,8 +175,8 @@ $lang->doc->errorEmptyLib = '文档库暂无数据。'; $lang->doc->noticeAcl['lib']['product']['default'] = '有所选产品访问权限的用户可以访问。'; $lang->doc->noticeAcl['lib']['product']['custom'] = '有所选产品访问权限或白名单里的用户可以访问。'; -$lang->doc->noticeAcl['lib']['project']['default'] = "有所选{$lang->executionCommon}访问权限的用户可以访问。"; -$lang->doc->noticeAcl['lib']['project']['custom'] = "有所选{$lang->executionCommon}访问权限或白名单里的用户可以访问。"; +$lang->doc->noticeAcl['lib']['execution']['default'] = "有所选{$lang->executionCommon}访问权限的用户可以访问。"; +$lang->doc->noticeAcl['lib']['execution']['custom'] = "有所选{$lang->executionCommon}访问权限或白名单里的用户可以访问。"; $lang->doc->noticeAcl['lib']['custom']['open'] = '所有人都可以访问。'; $lang->doc->noticeAcl['lib']['custom']['custom'] = '白名单的用户可以访问。'; $lang->doc->noticeAcl['lib']['custom']['private'] = '只有创建者自己可以访问。'; @@ -196,7 +196,7 @@ $lang->doclib->user = '用户'; $lang->doclib->files = '附件库'; $lang->doclib->all = '所有文档库'; $lang->doclib->select = '选择文档库'; -$lang->doclib->project = $lang->executionCommon . '库'; +$lang->doclib->execution = $lang->executionCommon . '库'; $lang->doclib->product = $lang->productCommon . '库'; $lang->doclib->aclListA['default'] = '默认'; @@ -207,14 +207,14 @@ $lang->doclib->aclListB['custom'] = '自定义'; $lang->doclib->aclListB['private'] = '私有'; $lang->doclib->create['product'] = '创建' . $lang->productCommon . '文档库'; -$lang->doclib->create['project'] = '创建' . $lang->executionCommon . '文档库'; +$lang->doclib->create['execution'] = '创建' . $lang->executionCommon . '文档库'; $lang->doclib->create['custom'] = '创建自定义文档库'; $lang->doclib->main['product'] = $lang->productCommon . '主库'; -$lang->doclib->main['project'] = $lang->executionCommon . '主库'; +$lang->doclib->main['execution'] = $lang->executionCommon . '主库'; $lang->doclib->tabList['product'] = $lang->productCommon; -$lang->doclib->tabList['project'] = $lang->executionCommon; +$lang->doclib->tabList['execution'] = $lang->executionCommon; $lang->doclib->tabList['custom'] = '自定义'; $lang->doclib->nameList['custom'] = '自定义文档库名称';