* Fix bug #18696.
This commit is contained in:
@@ -151,8 +151,14 @@ class doc extends control
|
||||
}
|
||||
|
||||
$products = $this->product->getPairs();
|
||||
$projects = $this->project->getPairsByProgram();
|
||||
$executions = $this->execution->getPairs();
|
||||
$projects = $this->project->getPairsByProgram('', 'all', true);
|
||||
$executions = $this->execution->getList();
|
||||
|
||||
/* Splice project name. */
|
||||
foreach($executions as $executionID => $execution) $executions[$executionID] = $projects[$execution->parent] . '/' . $execution->name;
|
||||
|
||||
/* Get the project that has permission to view. */
|
||||
foreach($projects as $projectID => $project) if(!$this->app->user->admin and strpos(',' . $this->app->user->view->projects . ',', ',' . $projectID . ',') === false) unset($projects[$projectID]);
|
||||
|
||||
if($type == 'execution')
|
||||
{
|
||||
|
||||
@@ -14,7 +14,7 @@ $lang->doc->common = 'Document';
|
||||
$lang->doc->id = 'ID';
|
||||
$lang->doc->product = $lang->productCommon;
|
||||
$lang->doc->project = 'Project';
|
||||
$lang->doc->execution = $lang->executionCommon;
|
||||
$lang->doc->execution = $lang->execution->common;
|
||||
$lang->doc->lib = 'Library';
|
||||
$lang->doc->module = 'Catalog';
|
||||
$lang->doc->object = 'Object';
|
||||
|
||||
@@ -14,7 +14,7 @@ $lang->doc->common = '文档';
|
||||
$lang->doc->id = '编号';
|
||||
$lang->doc->product = '所属' . $lang->productCommon;
|
||||
$lang->doc->project = '所属项目';
|
||||
$lang->doc->execution = '所属' . $lang->executionCommon;
|
||||
$lang->doc->execution = '所属' . $lang->execution->common;
|
||||
$lang->doc->lib = '所属文档库';
|
||||
$lang->doc->module = '所属目录';
|
||||
$lang->doc->object = '所属对象';
|
||||
|
||||
Reference in New Issue
Block a user