Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes to user deletion.

Browse Source 
Allow users with user permissions to delete users...wow. How many times can I say user?
This commit is contained in:
Andrew 2022-01-09 23:34:11 -05:00
parent db6a886e0f
commit 70cc90549d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/classes/web/panel_handler.py
View File

@ -16,8 +16,8 @@ from app.classes.shared.main_models import Users, installer
from app.classes.web.base_handler import BaseHandler from app.classes.web.base_handler import BaseHandler
from app.classes.models.servers import Servers from app.classes.models.servers import Servers
from app.classes.models.server_permissions import Enum_Permissions_Server from app.classes.models.server_permissions import Enum_Permissions_Server, Permissions_Servers
from app.classes.models.crafty_permissions import Enum_Permissions_Crafty from app.classes.models.crafty_permissions import Enum_Permissions_Crafty, Permissions_Crafty
from app.classes.models.management import management_helper from app.classes.models.management import management_helper
from app.classes.shared.helpers import helper from app.classes.shared.helpers import helper
@ -511,9 +511,13 @@ class PanelHandler(BaseHandler):
elif page == "remove_user": elif page == "remove_user":
user_id = bleach.clean(self.get_argument('id', None)) user_id = bleach.clean(self.get_argument('id', None))
if not exec_user['superuser']: if not exec_user['superuser'] and Enum_Permissions_Crafty.User_Config not in exec_user_crafty_permissions:
self.redirect("/panel/error?error=Unauthorized access: not superuser") self.redirect("/panel/error?error=Unauthorized access: not superuser")
return return
elif str(exec_user_id) == str(user_id):
self.redirect("/panel/error?error=Unauthorized access: you cannot delete yourself")
return
elif user_id is None: elif user_id is None:
self.redirect("/panel/error?error=Invalid User ID") self.redirect("/panel/error?error=Invalid User ID")
return return

1
app/frontend/templates/panel/panel_edit_user.html
View File

@ -286,6 +286,7 @@
label: '<i class="fa fa-times"></i> {{ translate('panelConfig', 'cancel', data['lang']) }}' label: '<i class="fa fa-times"></i> {{ translate('panelConfig', 'cancel', data['lang']) }}'
}, },
confirm: { confirm: {
className: 'btn-outline-warning',
label: '<i class="fa fa-check"></i> {{ translate('serverBackups', 'confirm', data['lang']) }}' label: '<i class="fa fa-check"></i> {{ translate('serverBackups', 'confirm', data['lang']) }}'
} }
}, },