Attachment 10131 Details for Bug 49859

[patch] Proposed patch

patch (text/plain), 2.78 KB, created by Jürn Brodersen on 2019-07-23 17:39 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Jürn Brodersen

Created: 2019-07-23 17:39 CEST

Size: 2.78 KB

patch

obsolete

>diff --git a/ucs-school-umc-exam/umc/python/schoolexam/__init__.py b/ucs-school-umc-exam/umc/python/schoolexam/__init__.py
>index 9d5b7f07a..21fa88442 100644
>--- a/ucs-school-umc-exam/umc/python/schoolexam/__init__.py
>+++ b/ucs-school-umc-exam/umc/python/schoolexam/__init__.py
>@@ -56,6 +56,7 @@ from univention.management.console.modules.distribution import compare_dn
> 
> from univention.lib.i18n import Translation
> from univention.lib.umc import Client, ConnectionError, HTTPError
>+from univention.lib.misc import custom_groupname
> 
> from ucsschool.lib.schoolldap import LDAP_Connection, SchoolBaseModule, SchoolSearchBase, SchoolSanitizer, Display
> from ucsschool.lib import internetrules
>@@ -177,7 +178,7 @@ class Instance(SchoolBaseModule):
> 		sender_user = User.from_dn(exam.sender.dn, None, ldap_user_read)
> 		if user.is_administrator(ldap_user_read) and len(set(sender_user.schools).intersection(user.schools)) != 0:
> 			return True
>-		admin_group_dn = 'cn=Domain Admins,cn=groups,' + ucr['ldap/base']
>+		admin_group_dn = 'cn={},cn=groups,{}'.format(custom_groupname('Domain Admins', ucr), ucr['ldap/base'])
> 		if admin_group_dn in user.get_udm_object(ldap_user_read)['groups']:
> 			return True
> 		return False
>@@ -254,14 +255,13 @@ class Instance(SchoolBaseModule):
> 			return False
> 		if exam.isDistributed:
> 			return False
>-		if not self._user_can_modify(User.from_dn(ldap_user_read.whoami(), None, ldap_user_read) ,exam):
>+		if not self._user_can_modify(User.from_dn(ldap_user_read.whoami(), None, ldap_user_read), exam):
> 			return False
> 		exam.purge()
> 		return True
> 
> 	@sanitize(StringSanitizer(required=True))
>-	@LDAP_Connection()
>-	def get(self, request, ldap_user_read=None):
>+	def get(self, request):
> 		result = []
> 		for project in [util.distribution.Project.load(iid) for iid in request.options]:
> 			if not project:
>@@ -295,17 +295,14 @@ class Instance(SchoolBaseModule):
> 		recipients=ListSanitizer(StringSanitizer(minimum=1), required=True),
> 		files=ListSanitizer(StringSanitizer()),
> 	)
>-	@require_password
>-	@LDAP_Connection()
>-	def add(self, request, ldap_user_read=None):
>+	def add(self, request):
> 		self._save_exam(request)
> 		self.finished(request.id, True)
> 
> 	@sanitize(
> 		exams=ListSanitizer(StringSanitizer(minimum=1), required=True)
> 	)
>-	@LDAP_Connection()
>-	def delete(self, request, ldap_user_read=None):
>+	def delete(self, request):
> 		result = []
> 		for exam in request.options['exams']:
> 			result.append(self._delete_exam(exam))
>@@ -323,9 +320,7 @@ class Instance(SchoolBaseModule):
> 		recipients=ListSanitizer(StringSanitizer(minimum=1), required=True),
> 		files=ListSanitizer(StringSanitizer()),
> 	)
>-	@require_password
>-	@LDAP_Connection()
>-	def put(self, request, ldap_user_read=None):
>+	def put(self, request):
> 		self._save_exam(request, update=True)
> 		self.finished(request.id, True)
>

Actions: View | Diff

Attachments on bug 49859: 10131