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

* Adjst the code.

Browse Source
This commit is contained in:
hufangzhou
2023-04-20 17:12:19 +08:00
parent 8c06cac8aa
commit b7bbb9cb16
7 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/zentaopms.php
+1 -2
View File
@@ -374,7 +374,6 @@ define('CHANGEVALUE', 100000000);
define('TABLE_PRIV', '`' . $config->db->prefix . 'priv`');
define('TABLE_PRIVLANG', '`' . $config->db->prefix . 'privlang`');
define('TABLE_PRIVPACKAGE', '`' . $config->db->prefix . 'privpackage`');
define('TABLE_PRIVMANAGER', '`' . $config->db->prefix . 'privmanager`');
define('TABLE_PRIVRELATION', '`' . $config->db->prefix . 'privrelation`');
@@ -433,7 +432,7 @@ $config->objectTables['automation'] = TABLE_AUTOMATION;
$config->objectTables['stepResult'] = TABLE_TESTRUN;
$config->objectTables['priv'] = TABLE_PRIV;
$config->objectTables['privlang'] = TABLE_PRIVLANG;
$config->objectTables['privpackage'] = TABLE_PRIVPACKAGE;
$config->objectTables['privmanager'] = TABLE_PRIVMANAGER;
$config->objectTables['privrelation'] = TABLE_PRIVRELATION;
$config->objectTables['scene'] = TABLE_SCENE;
module/action/config.php
-1
View File
@@ -51,7 +51,6 @@ $config->action->objectNameFields['repo'] = 'name';
$config->action->objectNameFields['dataview'] = 'name';
$config->action->objectNameFields['zahost'] = 'name';
$config->action->objectNameFields['zanode'] = 'name';
$config->action->objectNameFields['privpackage'] = 'name';
$config->action->objectNameFields['privlang'] = 'name';
$config->action->objectNameFields['scene'] = 'title';
module/action/lang/de.php
-1
View File
@@ -160,7 +160,6 @@ $lang->action->objectTypes['stage'] = 'Stage';
$lang->action->objectTypes['patch'] = 'Patch';
$lang->action->objectTypes['repo'] = 'Repo';
$lang->action->objectTypes['dataview'] = 'Data View';
$lang->action->objectTypes['privpackage'] = 'Priv Package';
$lang->action->objectTypes['privlang'] = 'Priv';
$lang->action->objectTypes['scene'] = 'Scene';
module/action/lang/en.php
-1
View File
@@ -160,7 +160,6 @@ $lang->action->objectTypes['stage'] = 'Stage';
$lang->action->objectTypes['patch'] = 'Patch';
$lang->action->objectTypes['repo'] = 'Repo';
$lang->action->objectTypes['dataview'] = 'Data View';
$lang->action->objectTypes['privpackage'] = 'Priv Package';
$lang->action->objectTypes['privlang'] = 'Priv';
$lang->action->objectTypes['scene'] = 'Scene';
module/action/lang/fr.php
-1
View File
@@ -160,7 +160,6 @@ $lang->action->objectTypes['stage'] = 'Stage';
$lang->action->objectTypes['patch'] = 'Patch';
$lang->action->objectTypes['repo'] = 'Repo';
$lang->action->objectTypes['dataview'] = 'Data View';
$lang->action->objectTypes['privpackage'] = 'Priv Package';
$lang->action->objectTypes['privlang'] = 'Priv';
$lang->action->objectTypes['scene'] = 'Scene';
module/action/lang/zh-cn.php
-1
View File
@@ -160,7 +160,6 @@ $lang->action->objectTypes['stage'] = '阶段';
$lang->action->objectTypes['patch'] = '补丁';
$lang->action->objectTypes['repo'] = '代码库';
$lang->action->objectTypes['dataview'] = '中间表';
$lang->action->objectTypes['privpackage'] = '权限包';
$lang->action->objectTypes['privlang'] = '权限';
$lang->action->objectTypes['scene'] = '场景';
module/action/model.php
+1 -1
View File
@@ -1480,7 +1480,7 @@ class actionModel extends model
}
elseif($objectType == 'privlang')
{
$objectName = $this->dao->select("priv AS id, $field AS name")->from($table)->where('priv')->in($objectIdList)->fetchPairs();
$objectName = $this->dao->select("objectID AS id, $field AS name")->from($table)->where('objectID')->in($objectIdList)->andWhere('objectType')->eq('priv')->fetchPairs();
}
else
{