* Merge module-admin 18.8-18.x to Merge184.

This commit is contained in:
chaideqing
2023-11-27 16:35:59 +08:00
parent 057c46c21e
commit d603c728d3
7 changed files with 19 additions and 6 deletions
+1 -1
View File
@@ -73,7 +73,7 @@ $config->admin->patchAPIURL = $config->admin->apiSite . 'extension-apiGetExte
$config->admin->downloadAPIURL = $config->admin->apiSite . 'download.json';
$config->admin->dynamicAPIURL = $config->admin->apiSite . 'dynamic-activities.json';
$config->admin->videoAPIURL = $config->admin->apiSite . 'publicclass.json';
$config->admin->liteMenuList = array('system', 'company', 'feature', 'message', 'extension', 'dev');
$config->admin->liteMenuList = array('system', 'company', 'feature', 'message', 'extension', 'dev', 'ai');
$config->admin->helpURL['system'] = 'https://www.zentao.net/book/zentaopms/538.html';
$config->admin->helpURL['company'] = 'https://www.zentao.net/book/zentaopms/38.html';
+1 -1
View File
@@ -261,7 +261,7 @@ class admin extends control
$this->setting->setItem('system.common.closedFeatures', rtrim($closedFeatures, ','));
$this->setting->setItem('system.common.global.scoreStatus', $data->module['myScore']);
$this->setting->setItem('system.custom.URAndSR', $data->module['productUR']);
$this->loadModel('setting')->setItem('system.custom.URAndSR', $this->config->edition == 'ipd' ? 1 : $data->module['productUR']);
$this->loadModel('custom')->processMeasrecordCron();
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'callback' => '$.apps.updateAppMenu'));
}
+1
View File
@@ -193,6 +193,7 @@ $lang->admin->noPriv = 'You have no permission to visit this block.';
$lang->admin->openTag = 'ZenTao Opensource ';
$lang->admin->bizTag = 'ZenTao Biz ';
$lang->admin->maxTag = 'ZenTao Max ';
$lang->admin->ipdTag = 'ZenTao IPD';
$lang->admin->bizInfoURL = 'https://www.zentao.net/page/enterprise.html';
$lang->admin->maxInfoURL = 'https://www.zentao.net/page/max.html';
+1
View File
@@ -193,6 +193,7 @@ $lang->admin->noPriv = 'You have no permission to visit this block.';
$lang->admin->openTag = 'ZenTao Opensource ';
$lang->admin->bizTag = 'ZenTao Biz ';
$lang->admin->maxTag = 'ZenTao Max ';
$lang->admin->ipdTag = 'ZenTao IPD';
$lang->admin->bizInfoURL = 'https://www.zentao.net/page/enterprise.html';
$lang->admin->maxInfoURL = 'https://www.zentao.net/page/max.html';
+1
View File
@@ -193,6 +193,7 @@ $lang->admin->noPriv = 'You have no permission to visit this block.';
$lang->admin->openTag = 'ZenTao Opensource ';
$lang->admin->bizTag = 'ZenTao Biz ';
$lang->admin->maxTag = 'ZenTao Max ';
$lang->admin->ipdTag = 'ZenTao IPD';
$lang->admin->bizInfoURL = 'https://www.zentao.net/page/enterprise.html';
$lang->admin->maxInfoURL = 'https://www.zentao.net/page/max.html';
+13 -4
View File
@@ -222,11 +222,20 @@ if(helper::hasFeature('devops'))
unset($lang->admin->menuList->platform['tabMenu']['menuOrder']['resource']['55']);
}
//$lang->admin->menuList->platform['menuOrder']['15'] = 'environment';
$lang->admin->menuList->platform['menuOrder']['20'] = 'resource';
$lang->admin->menuList->platform['menuOrder']['25'] = 'setrules';
$lang->admin->menuList->ai['name'] = $lang->admin->menuSetting['ai']['name'];
$lang->admin->menuList->ai['desc'] = $lang->admin->menuSetting['ai']['desc'];
$lang->admin->menuList->ai['link'] = 'ai|adminindex';
$lang->admin->menuList->ai['order'] = 60;
$lang->admin->menuList->ai['subMenu']['models'] = array('link' => "{$lang->admin->ai->model}|ai|models|", 'alias' => 'editmodel');
$lang->admin->menuList->platform['dividerMenu'] = ',plat,setrules,';
$lang->admin->menuList->ai['menuOrder']['15'] = 'models';
if($config->vision != 'or')
{
$lang->admin->menuList->ai['subMenu']['prompts'] = array('link' => "{$lang->admin->ai->prompt}|ai|prompts|", 'alias' => 'promptview,promptassignrole,promptselectdatasource,promptsetpurpose,promptsettargetform,promptfinalize,promptedit');
$lang->admin->menuList->ai['menuOrder']['5'] = 'prompts';
}
}
if($config->edition != 'max' and $config->edition != 'ipd')
+1
View File
@@ -193,6 +193,7 @@ $lang->admin->noPriv = '您没有访问该区块的权限。';
$lang->admin->openTag = '禅道';
$lang->admin->bizTag = '禅道企业版';
$lang->admin->maxTag = '禅道旗舰版';
$lang->admin->ipdTag = '禅道IPD版';
$lang->admin->bizInfoURL = 'https://www.zentao.net/page/enterprise.html';
$lang->admin->maxInfoURL = 'https://www.zentao.net/page/max.html';