From a3b352b29dff73cdd4d5eede000303c358746ee3 Mon Sep 17 00:00:00 2001 From: Hugo Levy-Falk Date: Tue, 21 Apr 2020 17:37:17 +0200 Subject: [PATCH 1/4] Fix #98 --- re2o/utils.py | 14 +++ templates/base.html | 2 + users/templates/users/edit_listright.html | 141 ++++++++++++++++++++++ users/views.py | 113 +++++++---------- 4 files changed, 200 insertions(+), 70 deletions(-) create mode 100644 users/templates/users/edit_listright.html diff --git a/re2o/utils.py b/re2o/utils.py index 7c49ff0a..d41bcf9d 100644 --- a/re2o/utils.py +++ b/re2o/utils.py @@ -213,3 +213,17 @@ def remove_user_room(room, force=True): if force or not user.has_access(): user.room = None user.save() + + +def permission_tree(queryset=None): + r = {} + permissions = queryset or Permission.objects.all() + for p in permissions: + key, app, model = p.natural_key() + name = p.name + if app not in r: + r[app] = {} + if model not in r[app]: + r[app][model] = {} + r[app][model][key] = p + return r diff --git a/templates/base.html b/templates/base.html index ced8061e..95bd3f37 100644 --- a/templates/base.html +++ b/templates/base.html @@ -48,6 +48,8 @@ with this program; if not, write to the Free Software Foundation, Inc., + {% block custom_js %}{% endblock %} + {# Load CSS #} {% bootstrap_css %} diff --git a/users/templates/users/edit_listright.html b/users/templates/users/edit_listright.html new file mode 100644 index 00000000..e8437295 --- /dev/null +++ b/users/templates/users/edit_listright.html @@ -0,0 +1,141 @@ +{% extends 'users/sidebar.html' %} +{% comment %} +Re2o est un logiciel d'administration développé initiallement au rezometz. Il +se veut agnostique au réseau considéré, de manière à être installable en +quelques clics. + +Copyright © 2017 Gabriel Détraz +Copyright © 2017 Lara Kermarec +Copyright © 2017 Augustin Lemesle + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +{% endcomment %} + +{% load bootstrap3 %} +{% load static %} +{% load i18n %} +{% block title %}{% trans "Users" %}{% endblock %} + +{% block custom_js %} + + + + +{% endblock %} + +{% block content %} + +{% bootstrap_form_errors form %} + +
+ {% csrf_token %} + {% bootstrap_field form.name %} + {% bootstrap_field form.unix_name %} + {% if form.gid %} + {% bootstrap_field form.gid %} + {% endif %} + {% bootstrap_field form.critical %} + {% bootstrap_field form.details %} + +
+ {% bootstrap_field form.permissions %} +
+ {% bootstrap_button action_name button_type="submit" icon='ok' button_class='btn-success' %} +
+{% if load_js_file %} + +{% endif %} +
+
+
+ + + +{% endblock %} + diff --git a/users/views.py b/users/views.py index 1c544ba6..b001f5cb 100644 --- a/users/views.py +++ b/users/views.py @@ -61,7 +61,7 @@ from preferences.models import OptionalUser, GeneralOption, AssoOption from importlib import import_module from re2o.settings_local import OPTIONNAL_APPS_RE2O from re2o.views import form -from re2o.utils import all_has_access +from re2o.utils import all_has_access, permission_tree from re2o.base import re2o_paginator, SortTable from re2o.acl import ( can_create, @@ -123,7 +123,9 @@ def new_user(request): GTU_sum_up = GeneralOption.get_cached_value("GTU_sum_up") GTU = GeneralOption.get_cached_value("GTU") - is_set_password_allowed = OptionalUser.get_cached_value("allow_set_password_during_user_creation") + is_set_password_allowed = OptionalUser.get_cached_value( + "allow_set_password_during_user_creation" + ) if user.is_valid(): user = user.save() @@ -200,11 +202,7 @@ def edit_club_admin_members(request, club_instance, **_kwargs): reverse("users:profil", kwargs={"userid": str(club_instance.id)}) ) return form( - { - "userform": club, - "showCGU": False, - "action_name": _("Edit"), - }, + {"userform": club, "showCGU": False, "action_name": _("Edit"),}, "users/user.html", request, ) @@ -234,9 +232,7 @@ def edit_info(request, user, userid): return redirect(reverse("users:profil", kwargs={"userid": str(userid)})) return form( - {"userform": user_form, "action_name": _("Edit")}, - "users/user.html", - request, + {"userform": user_form, "action_name": _("Edit")}, "users/user.html", request, ) @@ -250,12 +246,12 @@ def state(request, user, userid): user_instance = state_form.save() messages.success(request, _("The states were edited.")) if user_instance.trigger_email_changed_state(request): - messages.success(request, _("An email to confirm the address was sent.")) + messages.success( + request, _("An email to confirm the address was sent.") + ) return redirect(reverse("users:profil", kwargs={"userid": str(userid)})) return form( - {"userform": state_form, "action_name": _("Edit")}, - "users/user.html", - request, + {"userform": state_form, "action_name": _("Edit")}, "users/user.html", request, ) @@ -270,9 +266,7 @@ def groups(request, user, userid): messages.success(request, _("The groups were edited.")) return redirect(reverse("users:profil", kwargs={"userid": str(userid)})) return form( - {"userform": group_form, "action_name": _("Edit")}, - "users/user.html", - request, + {"userform": group_form, "action_name": _("Edit")}, "users/user.html", request, ) @@ -325,9 +319,7 @@ def new_serviceuser(request): messages.success(request, _("The service user was created.")) return redirect(reverse("users:index-serviceusers")) return form( - {"userform": user, "action_name": _("Add")}, - "users/user.html", - request, + {"userform": user, "action_name": _("Add")}, "users/user.html", request, ) @@ -342,9 +334,7 @@ def edit_serviceuser(request, serviceuser, **_kwargs): messages.success(request, _("The service user was edited.")) return redirect(reverse("users:index-serviceusers")) return form( - {"userform": serviceuser, "action_name": _("Edit")}, - "users/user.html", - request, + {"userform": serviceuser, "action_name": _("Edit")}, "users/user.html", request, ) @@ -380,9 +370,7 @@ def add_ban(request, user, userid): return redirect(reverse("users:profil", kwargs={"userid": str(userid)})) if user.is_ban(): messages.error(request, _("Warning: this user already has an active ban.")) - return form( - {"userform": ban, "action_name": _("Add")}, "users/user.html", request - ) + return form({"userform": ban, "action_name": _("Add")}, "users/user.html", request) @login_required @@ -399,9 +387,7 @@ def edit_ban(request, ban_instance, **_kwargs): ban.save() messages.success(request, _("The ban was edited.")) return redirect(reverse("users:index")) - return form( - {"userform": ban, "action_name": _("Edit")}, "users/user.html", request - ) + return form({"userform": ban, "action_name": _("Edit")}, "users/user.html", request) @login_required @@ -434,9 +420,7 @@ def add_whitelist(request, user, userid): request, _("Warning: this user already has an active whitelist.") ) return form( - {"userform": whitelist, "action_name": _("Add")}, - "users/user.html", - request, + {"userform": whitelist, "action_name": _("Add")}, "users/user.html", request, ) @@ -454,9 +438,7 @@ def edit_whitelist(request, whitelist_instance, **_kwargs): messages.success(request, _("The whitelist was edited.")) return redirect(reverse("users:index")) return form( - {"userform": whitelist, "action_name": _("Edit")}, - "users/user.html", - request, + {"userform": whitelist, "action_name": _("Edit")}, "users/user.html", request, ) @@ -489,11 +471,7 @@ def add_emailaddress(request, user, userid): messages.success(request, _("The local email account was created.")) return redirect(reverse("users:profil", kwargs={"userid": str(userid)})) return form( - { - "userform": emailaddress, - "showCGU": False, - "action_name": _("Add"), - }, + {"userform": emailaddress, "showCGU": False, "action_name": _("Add"),}, "users/user.html", request, ) @@ -516,11 +494,7 @@ def edit_emailaddress(request, emailaddress_instance, **_kwargs): ) ) return form( - { - "userform": emailaddress, - "showCGU": False, - "action_name": _("Edit"), - }, + {"userform": emailaddress, "showCGU": False, "action_name": _("Edit"),}, "users/user.html", request, ) @@ -556,7 +530,9 @@ def edit_email_settings(request, user_instance, **_kwargs): messages.success(request, _("The email settings were edited.")) if user_instance.send_confirm_email_if_necessary(request): - messages.success(request, _("An email to confirm your address was sent.")) + messages.success( + request, _("An email to confirm your address was sent.") + ) return redirect( reverse("users:profil", kwargs={"userid": str(user_instance.id)}) @@ -584,9 +560,7 @@ def add_school(request): messages.success(request, _("The school was added.")) return redirect(reverse("users:index-school")) return form( - {"userform": school, "action_name": _("Add")}, - "users/user.html", - request, + {"userform": school, "action_name": _("Add")}, "users/user.html", request, ) @@ -602,9 +576,7 @@ def edit_school(request, school_instance, **_kwargs): messages.success(request, _("The school was edited.")) return redirect(reverse("users:index-school")) return form( - {"userform": school, "action_name": _("Edit")}, - "users/user.html", - request, + {"userform": school, "action_name": _("Edit")}, "users/user.html", request, ) @@ -662,9 +634,7 @@ def edit_shell(request, shell_instance, **_kwargs): messages.success(request, _("The shell was edited.")) return redirect(reverse("users:index-shell")) return form( - {"userform": shell, "action_name": _("Edit")}, - "users/user.html", - request, + {"userform": shell, "action_name": _("Edit")}, "users/user.html", request, ) @@ -676,7 +646,9 @@ def del_shell(request, shell, **_kwargs): shell.delete() messages.success(request, _("The shell was deleted.")) return redirect(reverse("users:index-shell")) - return form({"objet": shell, "objet_name": _("shell")}, "users/delete.html", request) + return form( + {"objet": shell, "objet_name": _("shell")}, "users/delete.html", request + ) @login_required @@ -690,8 +662,8 @@ def add_listright(request): messages.success(request, _("The group of rights was added.")) return redirect(reverse("users:index-listright")) return form( - {"userform": listright, "action_name": _("Add")}, - "users/user.html", + {"form": listright, "action_name": _("Add"), "permissions": permission_tree()}, + "users/edit_listright.html", request, ) @@ -701,15 +673,20 @@ def add_listright(request): def edit_listright(request, listright_instance, **_kwargs): """ Editer un groupe/droit, necessite droit bureau, à partir du listright id """ - listright = ListRightForm(request.POST or None, instance=listright_instance) - if listright.is_valid(): - if listright.changed_data: - listright.save() + listright_form = ListRightForm(request.POST or None, instance=listright_instance) + if listright_form.is_valid(): + if listright_form.changed_data: + listright_form.save() messages.success(request, _("The group of rights was edited.")) return redirect(reverse("users:index-listright")) return form( - {"userform": listright, "action_name": _("Edit")}, - "users/user.html", + { + "form": listright_form, + "action_name": _("Edit"), + "permissions": permission_tree(), + "instance": listright_instance, + }, + "users/edit_listright.html", request, ) @@ -1064,7 +1041,7 @@ def process_email(request, req): return form( {"email": user.email, "name": user.get_full_name()}, "users/confirm_email.html", - request + request, ) @@ -1085,11 +1062,7 @@ def resend_confirmation_email(request, logged_user, userid): messages.success(request, _("An email to confirm your address was sent.")) return redirect(reverse("users:profil", kwargs={"userid": userid})) - return form( - {"email": user.email}, - "users/resend_confirmation_email.html", - request - ) + return form({"email": user.email}, "users/resend_confirmation_email.html", request) @login_required From da0b82000669e3d1ee2d73cab09cc1e6b576d1d1 Mon Sep 17 00:00:00 2001 From: Hugo Levy-Falk Date: Tue, 21 Apr 2020 17:37:17 +0200 Subject: [PATCH 2/4] Fix #98 --- re2o/utils.py | 14 +++ templates/base.html | 2 + users/templates/users/edit_listright.html | 141 ++++++++++++++++++++++ users/views.py | 113 +++++++---------- 4 files changed, 200 insertions(+), 70 deletions(-) create mode 100644 users/templates/users/edit_listright.html diff --git a/re2o/utils.py b/re2o/utils.py index 7c49ff0a..d41bcf9d 100644 --- a/re2o/utils.py +++ b/re2o/utils.py @@ -213,3 +213,17 @@ def remove_user_room(room, force=True): if force or not user.has_access(): user.room = None user.save() + + +def permission_tree(queryset=None): + r = {} + permissions = queryset or Permission.objects.all() + for p in permissions: + key, app, model = p.natural_key() + name = p.name + if app not in r: + r[app] = {} + if model not in r[app]: + r[app][model] = {} + r[app][model][key] = p + return r diff --git a/templates/base.html b/templates/base.html index ced8061e..95bd3f37 100644 --- a/templates/base.html +++ b/templates/base.html @@ -48,6 +48,8 @@ with this program; if not, write to the Free Software Foundation, Inc., + {% block custom_js %}{% endblock %} + {# Load CSS #} {% bootstrap_css %} diff --git a/users/templates/users/edit_listright.html b/users/templates/users/edit_listright.html new file mode 100644 index 00000000..e8437295 --- /dev/null +++ b/users/templates/users/edit_listright.html @@ -0,0 +1,141 @@ +{% extends 'users/sidebar.html' %} +{% comment %} +Re2o est un logiciel d'administration développé initiallement au rezometz. Il +se veut agnostique au réseau considéré, de manière à être installable en +quelques clics. + +Copyright © 2017 Gabriel Détraz +Copyright © 2017 Lara Kermarec +Copyright © 2017 Augustin Lemesle + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +{% endcomment %} + +{% load bootstrap3 %} +{% load static %} +{% load i18n %} +{% block title %}{% trans "Users" %}{% endblock %} + +{% block custom_js %} + + + + +{% endblock %} + +{% block content %} + +{% bootstrap_form_errors form %} + +
+ {% csrf_token %} + {% bootstrap_field form.name %} + {% bootstrap_field form.unix_name %} + {% if form.gid %} + {% bootstrap_field form.gid %} + {% endif %} + {% bootstrap_field form.critical %} + {% bootstrap_field form.details %} + +
+ {% bootstrap_field form.permissions %} +
+ {% bootstrap_button action_name button_type="submit" icon='ok' button_class='btn-success' %} +
+{% if load_js_file %} + +{% endif %} +
+
+
+ + + +{% endblock %} + diff --git a/users/views.py b/users/views.py index f37b9648..8450b9c2 100644 --- a/users/views.py +++ b/users/views.py @@ -61,7 +61,7 @@ from preferences.models import OptionalUser, GeneralOption, AssoOption from importlib import import_module from re2o.settings_local import OPTIONNAL_APPS_RE2O from re2o.views import form -from re2o.utils import all_has_access +from re2o.utils import all_has_access, permission_tree from re2o.base import re2o_paginator, SortTable from re2o.acl import ( can_create, @@ -122,7 +122,9 @@ def new_user(request): GTU_sum_up = GeneralOption.get_cached_value("GTU_sum_up") GTU = GeneralOption.get_cached_value("GTU") - is_set_password_allowed = OptionalUser.get_cached_value("allow_set_password_during_user_creation") + is_set_password_allowed = OptionalUser.get_cached_value( + "allow_set_password_during_user_creation" + ) if user.is_valid(): user = user.save() @@ -199,11 +201,7 @@ def edit_club_admin_members(request, club_instance, **_kwargs): reverse("users:profil", kwargs={"userid": str(club_instance.id)}) ) return form( - { - "userform": club, - "showCGU": False, - "action_name": _("Edit"), - }, + {"userform": club, "showCGU": False, "action_name": _("Edit"),}, "users/user.html", request, ) @@ -233,9 +231,7 @@ def edit_info(request, user, userid): return redirect(reverse("users:profil", kwargs={"userid": str(userid)})) return form( - {"userform": user_form, "action_name": _("Edit")}, - "users/user.html", - request, + {"userform": user_form, "action_name": _("Edit")}, "users/user.html", request, ) @@ -249,12 +245,12 @@ def state(request, user, userid): user_instance = state_form.save() messages.success(request, _("The states were edited.")) if user_instance.trigger_email_changed_state(request): - messages.success(request, _("An email to confirm the address was sent.")) + messages.success( + request, _("An email to confirm the address was sent.") + ) return redirect(reverse("users:profil", kwargs={"userid": str(userid)})) return form( - {"userform": state_form, "action_name": _("Edit")}, - "users/user.html", - request, + {"userform": state_form, "action_name": _("Edit")}, "users/user.html", request, ) @@ -269,9 +265,7 @@ def groups(request, user, userid): messages.success(request, _("The groups were edited.")) return redirect(reverse("users:profil", kwargs={"userid": str(userid)})) return form( - {"userform": group_form, "action_name": _("Edit")}, - "users/user.html", - request, + {"userform": group_form, "action_name": _("Edit")}, "users/user.html", request, ) @@ -324,9 +318,7 @@ def new_serviceuser(request): messages.success(request, _("The service user was created.")) return redirect(reverse("users:index-serviceusers")) return form( - {"userform": user, "action_name": _("Add")}, - "users/user.html", - request, + {"userform": user, "action_name": _("Add")}, "users/user.html", request, ) @@ -341,9 +333,7 @@ def edit_serviceuser(request, serviceuser, **_kwargs): messages.success(request, _("The service user was edited.")) return redirect(reverse("users:index-serviceusers")) return form( - {"userform": serviceuser, "action_name": _("Edit")}, - "users/user.html", - request, + {"userform": serviceuser, "action_name": _("Edit")}, "users/user.html", request, ) @@ -379,9 +369,7 @@ def add_ban(request, user, userid): return redirect(reverse("users:profil", kwargs={"userid": str(userid)})) if user.is_ban(): messages.error(request, _("Warning: this user already has an active ban.")) - return form( - {"userform": ban, "action_name": _("Add")}, "users/user.html", request - ) + return form({"userform": ban, "action_name": _("Add")}, "users/user.html", request) @login_required @@ -398,9 +386,7 @@ def edit_ban(request, ban_instance, **_kwargs): ban.save() messages.success(request, _("The ban was edited.")) return redirect(reverse("users:index")) - return form( - {"userform": ban, "action_name": _("Edit")}, "users/user.html", request - ) + return form({"userform": ban, "action_name": _("Edit")}, "users/user.html", request) @login_required @@ -433,9 +419,7 @@ def add_whitelist(request, user, userid): request, _("Warning: this user already has an active whitelist.") ) return form( - {"userform": whitelist, "action_name": _("Add")}, - "users/user.html", - request, + {"userform": whitelist, "action_name": _("Add")}, "users/user.html", request, ) @@ -453,9 +437,7 @@ def edit_whitelist(request, whitelist_instance, **_kwargs): messages.success(request, _("The whitelist was edited.")) return redirect(reverse("users:index")) return form( - {"userform": whitelist, "action_name": _("Edit")}, - "users/user.html", - request, + {"userform": whitelist, "action_name": _("Edit")}, "users/user.html", request, ) @@ -488,11 +470,7 @@ def add_emailaddress(request, user, userid): messages.success(request, _("The local email account was created.")) return redirect(reverse("users:profil", kwargs={"userid": str(userid)})) return form( - { - "userform": emailaddress, - "showCGU": False, - "action_name": _("Add"), - }, + {"userform": emailaddress, "showCGU": False, "action_name": _("Add"),}, "users/user.html", request, ) @@ -515,11 +493,7 @@ def edit_emailaddress(request, emailaddress_instance, **_kwargs): ) ) return form( - { - "userform": emailaddress, - "showCGU": False, - "action_name": _("Edit"), - }, + {"userform": emailaddress, "showCGU": False, "action_name": _("Edit"),}, "users/user.html", request, ) @@ -555,7 +529,9 @@ def edit_email_settings(request, user_instance, **_kwargs): messages.success(request, _("The email settings were edited.")) if user_instance.send_confirm_email_if_necessary(request): - messages.success(request, _("An email to confirm your address was sent.")) + messages.success( + request, _("An email to confirm your address was sent.") + ) return redirect( reverse("users:profil", kwargs={"userid": str(user_instance.id)}) @@ -583,9 +559,7 @@ def add_school(request): messages.success(request, _("The school was added.")) return redirect(reverse("users:index-school")) return form( - {"userform": school, "action_name": _("Add")}, - "users/user.html", - request, + {"userform": school, "action_name": _("Add")}, "users/user.html", request, ) @@ -601,9 +575,7 @@ def edit_school(request, school_instance, **_kwargs): messages.success(request, _("The school was edited.")) return redirect(reverse("users:index-school")) return form( - {"userform": school, "action_name": _("Edit")}, - "users/user.html", - request, + {"userform": school, "action_name": _("Edit")}, "users/user.html", request, ) @@ -661,9 +633,7 @@ def edit_shell(request, shell_instance, **_kwargs): messages.success(request, _("The shell was edited.")) return redirect(reverse("users:index-shell")) return form( - {"userform": shell, "action_name": _("Edit")}, - "users/user.html", - request, + {"userform": shell, "action_name": _("Edit")}, "users/user.html", request, ) @@ -675,7 +645,9 @@ def del_shell(request, shell, **_kwargs): shell.delete() messages.success(request, _("The shell was deleted.")) return redirect(reverse("users:index-shell")) - return form({"objet": shell, "objet_name": _("shell")}, "users/delete.html", request) + return form( + {"objet": shell, "objet_name": _("shell")}, "users/delete.html", request + ) @login_required @@ -689,8 +661,8 @@ def add_listright(request): messages.success(request, _("The group of rights was added.")) return redirect(reverse("users:index-listright")) return form( - {"userform": listright, "action_name": _("Add")}, - "users/user.html", + {"form": listright, "action_name": _("Add"), "permissions": permission_tree()}, + "users/edit_listright.html", request, ) @@ -700,15 +672,20 @@ def add_listright(request): def edit_listright(request, listright_instance, **_kwargs): """ Editer un groupe/droit, necessite droit bureau, à partir du listright id """ - listright = ListRightForm(request.POST or None, instance=listright_instance) - if listright.is_valid(): - if listright.changed_data: - listright.save() + listright_form = ListRightForm(request.POST or None, instance=listright_instance) + if listright_form.is_valid(): + if listright_form.changed_data: + listright_form.save() messages.success(request, _("The group of rights was edited.")) return redirect(reverse("users:index-listright")) return form( - {"userform": listright, "action_name": _("Edit")}, - "users/user.html", + { + "form": listright_form, + "action_name": _("Edit"), + "permissions": permission_tree(), + "instance": listright_instance, + }, + "users/edit_listright.html", request, ) @@ -1063,7 +1040,7 @@ def process_email(request, req): return form( {"email": user.email, "name": user.get_full_name()}, "users/confirm_email.html", - request + request, ) @@ -1084,11 +1061,7 @@ def resend_confirmation_email(request, logged_user, userid): messages.success(request, _("An email to confirm your address was sent.")) return redirect(reverse("users:profil", kwargs={"userid": userid})) - return form( - {"email": user.email}, - "users/resend_confirmation_email.html", - request - ) + return form({"email": user.email}, "users/resend_confirmation_email.html", request) @login_required From 90dc125355262956e5287829910134ec6be45128 Mon Sep 17 00:00:00 2001 From: Hugo Levy-Falk Date: Tue, 21 Apr 2020 18:08:18 +0200 Subject: [PATCH 3/4] Production version of VueJS --- users/templates/users/edit_listright.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/templates/users/edit_listright.html b/users/templates/users/edit_listright.html index e8437295..00eb62c8 100644 --- a/users/templates/users/edit_listright.html +++ b/users/templates/users/edit_listright.html @@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block custom_js %} - + {% endblock %} From 5df604e792ef0444db25beb699b4174ff88087e8 Mon Sep 17 00:00:00 2001 From: Hugo Levy-Falk Date: Tue, 21 Apr 2020 18:17:47 +0200 Subject: [PATCH 4/4] Fix dead code. --- users/templates/users/edit_listright.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/users/templates/users/edit_listright.html b/users/templates/users/edit_listright.html index 00eb62c8..d07b31bf 100644 --- a/users/templates/users/edit_listright.html +++ b/users/templates/users/edit_listright.html @@ -120,17 +120,13 @@ with this program; if not, write to the Free Software Foundation, Inc., onNodeChecked(node) { if ("checkbox_value" in node.data) { var selector = '#id_ListRight-permissions input[value="'.concat(node.data.checkbox_value, '"]'); - console.log(selector); document.querySelector(selector).checked=true; - // document.getElementById(node.data.checkbox_id).checked=true; } }, onNodeUnchecked(node) { if ("checkbox_value" in node.data) { var selector = '#id_ListRight-permissions input[value="'.concat(node.data.checkbox_value, '"]'); - console.log(selector); document.querySelector(selector).checked=false; - // document.getElementById(node.data.checkbox_id).checked=false; } }, }