diff --git a/module/personnel/config/table.php b/module/personnel/config/table.php index 2c9cfc5c27..9408b412bc 100644 --- a/module/personnel/config/table.php +++ b/module/personnel/config/table.php @@ -41,7 +41,7 @@ $config->personnel->whitelist->actionList['unbindWhitelist']['icon'] = 'unlink' $config->personnel->whitelist->actionList['unbindWhitelist']['hint'] = $lang->personnel->delete; $config->personnel->whitelist->actionList['unbindWhitelist']['text'] = $lang->personnel->delete; $config->personnel->whitelist->actionList['unbindWhitelist']['show'] = 'clickable'; -$config->personnel->whitelist->actionList['unbindWhitelist']['link'] = array('module' => 'personnel', 'method' => 'unbindWhitelist', 'params' => 'userID={id}'); +$config->personnel->whitelist->actionList['unbindWhitelist']['url'] = array('module' => 'personnel', 'method' => 'unbindWhitelist', 'params' => 'userID={id}'); $config->personnel->whitelist->dtable->fieldList['id']['name'] = 'id'; $config->personnel->whitelist->dtable->fieldList['id']['title'] = $lang->idAB; diff --git a/module/personnel/js/whitelist.ui.js b/module/personnel/js/whitelist.ui.js deleted file mode 100644 index 8dd4613777..0000000000 --- a/module/personnel/js/whitelist.ui.js +++ /dev/null @@ -1,9 +0,0 @@ -window.renderCell = function(result, {col, row}) -{ - if(col.name == 'actions') - { - result[0]['props']['items'][0]['link'] = $.createLink(module, 'unbindWhitelist', 'id=' + row.data.id); - } - - return result; -} diff --git a/module/personnel/ui/whitelist.html.php b/module/personnel/ui/whitelist.html.php index 502e9201d1..b4221ebe57 100644 --- a/module/personnel/ui/whitelist.html.php +++ b/module/personnel/ui/whitelist.html.php @@ -10,7 +10,7 @@ declare(strict_types=1); */ namespace zin; -jsVar('module', $module); +$config->personnel->whitelist->actionList['unbindWhitelist']['url'] = array('module' => $module, 'method' => 'unbindWhitelist', 'params' => 'userID={id}'); $config->personnel->whitelist->dtable->fieldList['dept']['map'] = $depts; @@ -46,7 +46,6 @@ dtable set::cols($cols), set::data($data), set::fixedLeftWidth('0.33'), - set::onRenderCell(jsRaw('window.renderCell')), set::footPager(usePager()), );