* code for task #89916.

This commit is contained in:
wangyidong
2023-04-07 13:11:17 +08:00
parent 56ae0cf008
commit a065b6e7d7
5 changed files with 6 additions and 5 deletions
+1 -1
View File
@@ -70,7 +70,7 @@ $lang->doc->project = $lang->projectCommon;
$lang->doc->execution = $lang->execution->common;
$lang->doc->lib = 'Bibliothek';
$lang->doc->module = 'Modul';
$lang->doc->libAndModule = 'Bibliothek & Modul';
$lang->doc->libAndModule = 'Bibliothek&Modul';
$lang->doc->object = 'Object';
$lang->doc->title = 'Titel';
$lang->doc->digest = 'Zusammenfassung';
+1 -1
View File
@@ -70,7 +70,7 @@ $lang->doc->project = $lang->projectCommon;
$lang->doc->execution = $lang->execution->common;
$lang->doc->lib = 'Library';
$lang->doc->module = 'Catalog';
$lang->doc->libAndModule = 'Library & Catalog';
$lang->doc->libAndModule = 'Library&Catalog';
$lang->doc->object = 'Object';
$lang->doc->title = 'Name';
$lang->doc->digest = 'Summary';
+1 -1
View File
@@ -70,7 +70,7 @@ $lang->doc->project = $lang->projectCommon;
$lang->doc->execution = $lang->execution->common;
$lang->doc->lib = 'Bibliothèque';
$lang->doc->module = 'Catégorie';
$lang->doc->libAndModule = 'Library & Catalog';
$lang->doc->libAndModule = 'Library&Catalog';
$lang->doc->object = 'Object';
$lang->doc->title = 'Nom';
$lang->doc->digest = 'Résumé';
+2 -1
View File
@@ -487,6 +487,7 @@ class docModel extends model
$modules = array();
$objects = array('product' => 'products', 'execution' => 'executions', 'project' => 'projects');
$this->loadModel('tree');
foreach($docs as $index => $doc)
{
if(!isset($modules[$doc->lib])) $modules[$doc->lib] = $this->tree->getOptionMenu($doc->lib, 'doc', 0, 0, 'nodeleted', 'all', ' > ');
@@ -2054,7 +2055,7 @@ class docModel extends model
->andWhere('vision')->eq($this->config->vision)
->andWhere('id')->in($docIdList)
->fetch();
$statisticInfo->myCollection = $this->dao->select('count(*) from count')->from(TABLE_DOCACTION)
$statisticInfo->myCollection = $this->dao->select('count(*) as count')->from(TABLE_DOCACTION)
->where('doc')->in($docIdList)
->andWhere('action')->eq('collect')
->andWhere('actor')->eq($this->app->user->account)
+1 -1
View File
@@ -19,7 +19,7 @@
</div>
<form method='post' class='form-ajax'>
<table class='table table-form'>
<tr><th class='w-100px'></th><td></td><th class='w-100px'></th><td></td></tr>
<tr><th class='w-120px'></th><td></td><th class='w-100px'></th><td></td></tr>
<tr>
<th><?php echo $lang->doc->space?></th>
<td colspan='3'><?php echo html::radio('space', $spaceList, '', "onchange=changeSpace()");?></td>