From 689767c3a7467625bbace188f319e5fb8b988a1c Mon Sep 17 00:00:00 2001 From: Apex Liu Date: Thu, 22 Mar 2018 17:54:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=9A=B4=E5=8A=9B=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E8=A7=A3=E5=86=B3=E6=8E=88=E6=9D=83=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E6=98=A0=E5=B0=84=E6=9B=B4=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E6=95=88=E7=8E=87=E4=BD=8E=E4=B8=8B=E4=BD=86=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E5=B7=A5=E4=BD=9C=E4=BA=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/server/script/main.py | 13 +- .../static/js/user/user-group-list.js | 33 +- .../www/teleport/webroot/app/model/audit.py | 10 +- .../www/teleport/webroot/app/model/group.py | 14 +- server/www/teleport/webroot/app/model/ops.py | 13 +- .../www/teleport/webroot/app/model/policy.py | 604 ++++++++++++++++++ 6 files changed, 656 insertions(+), 31 deletions(-) create mode 100644 server/www/teleport/webroot/app/model/policy.py diff --git a/dist/server/script/main.py b/dist/server/script/main.py index 710c67d..f3e0c3e 100644 --- a/dist/server/script/main.py +++ b/dist/server/script/main.py @@ -566,10 +566,10 @@ class InstallerLinux(InstallerBase): os.chmod(_d[1], stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH) # create symbolic link - os.symlink('/etc/init.d/teleport', '/etc/rc2.d/S50teleport') - os.symlink('/etc/init.d/teleport', '/etc/rc3.d/S50teleport') - os.symlink('/etc/init.d/teleport', '/etc/rc4.d/S50teleport') - os.symlink('/etc/init.d/teleport', '/etc/rc5.d/S50teleport') + os.symlink('/etc/init.d/teleport', '/etc/rc2.d/S95teleport') + os.symlink('/etc/init.d/teleport', '/etc/rc3.d/S95teleport') + os.symlink('/etc/init.d/teleport', '/etc/rc4.d/S95teleport') + os.symlink('/etc/init.d/teleport', '/etc/rc5.d/S95teleport') def _start_service(self): cc.v('') @@ -603,6 +603,11 @@ class InstallerLinux(InstallerBase): utils.remove('/etc/rc3.d/S50teleport') utils.remove('/etc/rc4.d/S50teleport') utils.remove('/etc/rc5.d/S50teleport') + # from 3.0.0.3, the start order changed from 50 to 95 for MySQL compatible, because start order of MySQL is 64. + utils.remove('/etc/rc2.d/S95teleport') + utils.remove('/etc/rc3.d/S95teleport') + utils.remove('/etc/rc4.d/S95teleport') + utils.remove('/etc/rc5.d/S95teleport') def _check_service(self): cc.v('') diff --git a/server/www/teleport/static/js/user/user-group-list.js b/server/www/teleport/static/js/user/user-group-list.js index 19da6bf..5c6acd6 100644 --- a/server/www/teleport/static/js/user/user-group-list.js +++ b/server/www/teleport/static/js/user/user-group-list.js @@ -158,7 +158,7 @@ $app.create_controls = function (cb_stack) { // $app.dom.btn_unlock_group.click(function () { // $app.on_btn_unlock_group_click(); // }); - $app.dom.btn_remove_group.click(function(){ + $app.dom.btn_remove_group.click(function () { $app.on_btn_remove_group_click(); }); @@ -274,14 +274,33 @@ $app.on_table_groups_render_created = function (render) { if (_.isUndefined(fields.members)) return ''; + console.log(fields.members); + var ret = []; for (var i = 0; i < fields.members.length; ++i) { - ret.push('