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

Merge branch 'cyy_21322'

Browse Source
This commit is contained in:
liyuchun
2022-04-24 09:57:05 +08:00
parent d484790e8a 49708b72a0
commit f0b8309968
8 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/common/ext/lang/en/lite.php
+1 -1
View File
@@ -151,7 +151,7 @@ $lang->admin->menu->dev = array('link' => "$lang->redev|dev|api", 'alias'
$lang->admin->menu->message = array('link' => "{$lang->message->common}|message|index", 'subModule' => 'message,mail,webhook,sms');
$lang->admin->menu->system = array('link' => "{$lang->admin->system}|backup|index", 'subModule' => 'cron,backup,action,admin,search,ldap', 'exclude' => 'admin-index,admin-xuanxuan,admin-register,admin-ztcompany');
$lang->admin->menu->xuanxuan['link'] = 'Chat|admin|xuanxuan';
if($config->vision != 'lite') $lang->admin->menu->xuanxuan['link'] = 'Chat|admin|xuanxuan';
/* Admin menu order. */
$lang->admin->menuOrder = array();
extension/lite/common/ext/lang/zh-cn/lite.php
+1 -1
View File
@@ -151,7 +151,7 @@ $lang->admin->menu->dev = array('link' => "$lang->redev|dev|api", 'alias'
$lang->admin->menu->message = array('link' => "{$lang->message->common}|message|index", 'subModule' => 'message,mail,webhook,sms');
$lang->admin->menu->system = array('link' => "{$lang->admin->system}|backup|index", 'subModule' => 'cron,backup,action,admin,search,ldap', 'exclude' => 'admin-index,admin-xuanxuan,admin-register,admin-ztcompany');
$lang->admin->menu->xuanxuan['link'] = '聊天|admin|xuanxuan';
if($config->vision != 'lite') $lang->admin->menu->xuanxuan['link'] = '聊天|admin|xuanxuan';
/* Admin menu order. */
$lang->admin->menuOrder = array();
module/api/control.php
+2 -1
View File
@@ -34,8 +34,9 @@ class api extends control
public function index($libID = 0, $moduleID = 0, $apiID = 0, $version = 0, $release = 0, $appendLib = 0)
{
/* Get all api doc libraries. */
$libs = $this->doc->getApiLibs($appendLib);
$libs = $this->doc->getApiLibs($appendLib);
if($libID == 0 and !empty($libs)) $libID = key($libs);
$lib = $this->doc->getLibById($libID);
$appendLib = (!empty($lib) and $lib->deleted == '1') ? $libID : 0;
module/file/model.php
+2
View File
@@ -735,6 +735,8 @@ class fileModel extends model
$content = $this->pasteImage($data->$editorID, $uid);
if($content) $data->$editorID = $content;
$data->$editorID = htmlspecialchars_decode($data->$editorID);
$data->$editorID = preg_replace("/ src=\"$readLinkReg\" /", ' src="' . $imgURL . '" ', $data->$editorID);
$data->$editorID = preg_replace("/ src=\"" . htmlSpecialString($readLinkReg) . "\" /", ' src="' . $imgURL . '" ', $data->$editorID);
module/file/view/export2csv.html.php
+1 -1
View File
@@ -17,7 +17,7 @@ foreach($rows as $row)
echo '"';
foreach($fields as $fieldName => $fieldLabel)
{
isset($row->$fieldName) ? print(str_replace('"', '“', htmlspecialchars_decode(strip_tags($row->$fieldName, '<img>')))) : print('');
isset($row->$fieldName) ? print(str_replace(array('"', '&nbsp;'), array('“', ' '), htmlspecialchars_decode(strip_tags($row->$fieldName, '<img>')))) : print('');
echo '","';
}
echo '"' . "\n";
module/task/model.php
+1 -1
View File
@@ -2291,7 +2291,7 @@ class taskModel extends model
public function getUserTasks($account, $type = 'assignedTo', $limit = 0, $pager = null, $orderBy = "id_desc", $projectID = 0)
{
if(!$this->loadModel('common')->checkField(TABLE_TASK, $type)) return array();
$tasks = $this->dao->select('t1.*, t2.id as executionID, t2.name as executionName, t3.id as storyID, t3.title as storyTitle, t3.status AS storyStatus, t3.version AS latestStoryVersion')
$tasks = $this->dao->select('t1.*, t2.id as executionID, t2.name as executionName, t2.type as executionType, t3.id as storyID, t3.title as storyTitle, t3.status AS storyStatus, t3.version AS latestStoryVersion')
->from(TABLE_TASK)->alias('t1')
->leftJoin(TABLE_EXECUTION)->alias('t2')->on("t1.execution = t2.id")
->leftJoin(TABLE_STORY)->alias('t3')->on('t1.story = t3.id')
xuanxuan/extension/xuan/common/ext/lang/en/xuanxuan.php
+5 -2
View File
@@ -1,7 +1,10 @@
<?php
$lang->xuanxuan = new stdclass();
$lang->admin->menu->xuanxuan = array('link' => 'Desktop|admin|xuanxuan', 'subModule' => 'client,setting');
$lang->admin->menuOrder[6] = 'xuanxuan';
if($config->vision != 'lite')
{
$lang->admin->menu->xuanxuan = array('link' => 'Desktop|admin|xuanxuan', 'subModule' => 'client,setting');
$lang->admin->menuOrder[6] = 'xuanxuan';
}
$lang->admin->menu->xuanxuan['subMenu'] = new stdclass();
$lang->admin->menu->xuanxuan['subMenu']->index = array('link' => 'Home|admin|xuanxuan');
xuanxuan/extension/xuan/common/ext/lang/zh-cn/xuanxuan.php
+5 -2
View File
@@ -1,7 +1,10 @@
<?php
$lang->xuanxuan = new stdclass();
$lang->admin->menu->xuanxuan = array('link' => '聊天|admin|xuanxuan', 'subModule' => 'client,setting');
$lang->admin->menuOrder[6] = 'xuanxuan';
if($config->vision != 'lite')
{
$lang->admin->menu->xuanxuan = array('link' => '聊天|admin|xuanxuan', 'subModule' => 'client,setting');
$lang->admin->menuOrder[6] = 'xuanxuan';
}
$lang->admin->menu->xuanxuan['subMenu'] = new stdclass();
$lang->admin->menu->xuanxuan['subMenu']->index = array('link' => '首页|admin|xuanxuan');