Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task#9060.

Browse Source
This commit is contained in:
leiyong
2021-01-26 09:01:28 +08:00
parent b6cc2dca06
commit d58f26a22a
9 changed files with 49 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/de.php
+2 -4
View File
@@ -569,11 +569,9 @@ $lang->admin->subMenu->data->backup = array('link' => 'Backup|backup|index', 'su
$lang->admin->subMenu->data->trash = array('link' => 'Aufräumen|action|trash');
$lang->admin->subMenu->system = new stdclass();
$lang->admin->subMenu->system->cron = array('link' => 'Cron|cron|index', 'subModule' => 'cron');
$lang->admin->subMenu->system->timezone = array('link' => 'Timezone|custom|timezone', 'subModule' => 'custom');
$lang->admin->subMenu->system->cron = array('link' => 'Cron|cron|index', 'subModule' => 'cron');
$lang->admin->subMenu->system->timezone = array('link' => 'Timezone|custom|timezone', 'subModule' => 'custom');
$lang->admin->subMenu->system->buildIndex = array('link' => 'Full Text Search|search|buildindex|');
$lang->admin->subMenuOrder->system[15] = 'buildIndex';
$lang->convert = new stdclass();
$lang->upgrade = new stdclass();
module/common/lang/en.php
+2 -4
View File
@@ -569,11 +569,9 @@ $lang->admin->subMenu->data->backup = array('link' => 'Backup|backup|index', 'su
$lang->admin->subMenu->data->trash = 'Recycle|action|trash';
$lang->admin->subMenu->system = new stdclass();
$lang->admin->subMenu->system->cron = array('link' => 'Cron|cron|index', 'subModule' => 'cron');
$lang->admin->subMenu->system->timezone = array('link' => 'Timezone|custom|timezone', 'subModule' => 'custom');
$lang->admin->subMenu->system->cron = array('link' => 'Cron|cron|index', 'subModule' => 'cron');
$lang->admin->subMenu->system->timezone = array('link' => 'Timezone|custom|timezone', 'subModule' => 'custom');
$lang->admin->subMenu->system->buildIndex = array('link' => 'Full Text Search|search|buildindex|');
$lang->admin->subMenuOrder->system[15] = 'buildIndex';
$lang->convert = new stdclass();
$lang->upgrade = new stdclass();
module/common/lang/fr.php
+2 -4
View File
@@ -569,11 +569,9 @@ $lang->admin->subMenu->data->backup = array('link' => 'Backup|backup|index', 'su
$lang->admin->subMenu->data->trash = 'Corbeille|action|trash';
$lang->admin->subMenu->system = new stdclass();
$lang->admin->subMenu->system->cron = array('link' => 'Cron|cron|index', 'subModule' => 'cron');
$lang->admin->subMenu->system->timezone = array('link' => 'Timezone|custom|timezone', 'subModule' => 'custom');
$lang->admin->subMenu->system->cron = array('link' => 'Cron|cron|index', 'subModule' => 'cron');
$lang->admin->subMenu->system->timezone = array('link' => 'Timezone|custom|timezone', 'subModule' => 'custom');
$lang->admin->subMenu->system->buildIndex = array('link' => 'Full Text Search|search|buildindex|');
$lang->admin->subMenuOrder->system[15] = 'buildIndex';
$lang->convert = new stdclass();
$lang->upgrade = new stdclass();
module/common/lang/menuOrder.php
+1
View File
@@ -180,6 +180,7 @@ $lang->admin->subMenuOrder->data[5] = 'backup';
$lang->admin->subMenuOrder->data[10] = 'trash';
$lang->admin->subMenuOrder->system[5] = 'cron';
$lang->admin->subMenuOrder->system[10] = 'timezone';
$lang->admin->subMenuOrder->system[15] = 'buildIndex';
$lang->convert->menuOrder = $lang->admin->menuOrder;
$lang->upgrade->menuOrder = $lang->admin->menuOrder;
module/common/lang/vi.php
+2 -4
View File
@@ -569,11 +569,9 @@ $lang->admin->subMenu->data->backup = array('link' => 'Backup|backup|index', 'su
$lang->admin->subMenu->data->trash = 'Recycle|action|trash';
$lang->admin->subMenu->system = new stdclass();
$lang->admin->subMenu->system->cron = array('link' => 'Cron|cron|index', 'subModule' => 'cron');
$lang->admin->subMenu->system->timezone = array('link' => 'Timezone|custom|timezone', 'subModule' => 'custom');
$lang->admin->subMenu->system->cron = array('link' => 'Cron|cron|index', 'subModule' => 'cron');
$lang->admin->subMenu->system->timezone = array('link' => 'Timezone|custom|timezone', 'subModule' => 'custom');
$lang->admin->subMenu->system->buildIndex = array('link' => 'Full Text Search|search|buildindex|');
$lang->admin->subMenuOrder->system[15] = 'buildIndex';
$lang->convert = new stdclass();
$lang->upgrade = new stdclass();
module/common/lang/zh-cn.php
+2 -4
View File
@@ -569,11 +569,9 @@ $lang->admin->subMenu->data->backup = array('link' => '备份|backup|index', 'su
$lang->admin->subMenu->data->trash = '回收站|action|trash';
$lang->admin->subMenu->system = new stdclass();
$lang->admin->subMenu->system->cron = array('link' => '定时|cron|index', 'subModule' => 'cron');
$lang->admin->subMenu->system->timezone = array('link' => '时区|custom|timezone', 'subModule' => 'custom');
$lang->admin->subMenu->system->cron = array('link' => '定时|cron|index', 'subModule' => 'cron');
$lang->admin->subMenu->system->timezone = array('link' => '时区|custom|timezone', 'subModule' => 'custom');
$lang->admin->subMenu->system->buildIndex = array('link' => '重建索引|search|buildindex|');
$lang->admin->subMenuOrder->system[15] = 'buildIndex';
$lang->convert = new stdclass();
$lang->upgrade = new stdclass();
module/doc/model.php
+4 -3
View File
@@ -1125,8 +1125,8 @@ class docModel extends model
$nonzeroLibs = $this->dao->select('lib,count(*) as count')->from(TABLE_DOC)->where('deleted')->eq('0')->groupBy('lib')->having('count')->ne(0)->fetchPairs('lib', 'lib');
}
$idList = array();
$projectID = $this->session->PRJ;
$idList = array();
$projectID = $this->session->PRJ;
$executionStatus = strpos($this->config->doc->custom->showLibs, 'unclosed') !== false ? 'undone' : 'all';
/* If it is a project module, query the project related products. */
@@ -1367,9 +1367,10 @@ class docModel extends model
{
if($type == 'project' && $file->objectType == 'task') $file->PRJ = $taskPairs[$file->objectID];
if($type == 'project' && $file->objectType == 'build') $file->PRJ = $buildPairs[$file->objectID];
$pathName = $this->file->getRealPathName($file->pathname);
$file->realPath = $this->file->savePath . $pathName;
$file->webPath = $this->file->webPath . $pathName;
$file->webPath = $this->file->webPath . $pathName;
}
return $files;
module/search/control.php
+1 -1
View File
@@ -158,7 +158,7 @@ class search extends control
}
$this->lang->search->menu = $this->lang->admin->menu;
$this->lang->menugroup->search = 'admin';
$this->lang->menugroup->search = 'system';
$this->view->title = $this->lang->search->buildIndex;
$this->display();
module/search/model.php
+33
View File
@@ -607,6 +607,8 @@ class searchModel extends model
$fields = $this->config->search->fields->{$objectType};
if(empty($fields)) return true;
if($objectType == 'doc' && isset($this->config->bizVersion)) $object = $this->appendFiles($object);
$index = new stdclass();
$index->objectID = $object->{$fields->id};
$index->objectType = $objectType;
@@ -1089,4 +1091,35 @@ class searchModel extends model
$string = str_replace($labels, $to, $string);
return preg_replace("/[{$to}]+/", $to, trim($string, $to));
}
/**
* Append document content to the document.
*
* @param string $object
* @access public
* @return void
*/
public function appendFiles($object)
{
$docFiles = $this->dao->select('files')->from(TABLE_DOCCONTENT)->where('doc')->eq($object->id)->orderBy('version')->limit(1)->fetch('files');
if(empty($docFiles)) return $object;
$allDocFiles = $this->loadModel('file')->getByObject('doc', $object->id);
if(!isset($object->comment)) $object->comment = '';
foreach($allDocFiles as $file)
{
if(strpos(",$docFiles,", ",{$file->id},") === false) continue;
if(strpos('docx|doc', $file->extension) !== false)
{
$convertedFile = $this->file->convertOffice($file, 'txt');
if($convertedFile) $object->comment .= file_get_contents($convertedFile);
}
if($file->extension == 'txt')
{
$object->comment .= file_get_contents($file->realPath);
}
}
return $object;
}
}