Merge branch 'sprint/tianshujie_bug20789' into 'master'
Sprint/tianshujie bug20789 See merge request easycorp/zentaopms!2714
This commit is contained in:
@@ -218,6 +218,7 @@ $config->openMethods[] = 'kanban.activatecard';
|
||||
$config->openMethods[] = 'kanban.finishcard';
|
||||
$config->openMethods[] = 'kanban.deleteobjectcard';
|
||||
$config->openMethods[] = 'admin.ignore';
|
||||
$config->openMethods[] = 'personnel.unbindwhitelist';
|
||||
|
||||
/* Define the tables. */
|
||||
define('TABLE_COMPANY', '`' . $config->db->prefix . 'company`');
|
||||
|
||||
@@ -153,13 +153,11 @@ $lang->resource->personnel->accessible = 'accessible';
|
||||
$lang->resource->personnel->invest = 'invest';
|
||||
$lang->resource->personnel->whitelist = 'whitelist';
|
||||
$lang->resource->personnel->addWhitelist = 'addWhitelist';
|
||||
$lang->resource->personnel->unbindWhitelist = 'unbindWhitelist';
|
||||
|
||||
$lang->personnel->methodOrder[5] = 'accessible';
|
||||
$lang->personnel->methodOrder[10] = 'invest';
|
||||
$lang->personnel->methodOrder[15] = 'whitelist';
|
||||
$lang->personnel->methodOrder[20] = 'addWhitelist';
|
||||
$lang->personnel->methodOrder[25] = 'unbindWhitelist';
|
||||
|
||||
global $config;
|
||||
if($config->systemMode == 'new')
|
||||
|
||||
Reference in New Issue
Block a user