From f6afd724fb52a37181dc32f979c54d88e665ae3f Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Mon, 5 Jun 2017 21:58:18 +0200 Subject: [PATCH 1/2] Add fixtures for the signoff testers group Add the fixtures corresponding to the signoff testers group on the live server. Signed-off-by: Jelle van der Waa --- main/fixtures/groups.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/main/fixtures/groups.json b/main/fixtures/groups.json index 2205be7c..9fa0e411 100644 --- a/main/fixtures/groups.json +++ b/main/fixtures/groups.json @@ -500,5 +500,24 @@ }, "model": "auth.group", "pk": 11 +}, +{ + "fields": { + "name": "Testers", + "permissions": [ + [ + "add_signoff", + "packages", + "signoff" + ], + [ + "change_signoff", + "packages", + "signoff" + ] + ] + }, + "model": "auth.group", + "pk": 12 } ] From 273c27adea5cfcd67770dfe981d3eaede25443e5 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Mon, 5 Jun 2017 21:59:01 +0200 Subject: [PATCH 2/2] Change signoff permissions for Testers group Change the permissions required for a signoff, so that the testers group does not need change_package permission Signed-off-by: Jelle van der Waa --- packages/views/signoff.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/views/signoff.py b/packages/views/signoff.py index fcc6de45..8596fa9f 100644 --- a/packages/views/signoff.py +++ b/packages/views/signoff.py @@ -16,7 +16,7 @@ from ..utils import (get_signoff_groups, approved_by_signoffs, PackageSignoffGroup) -@permission_required('main.change_package') +@permission_required('packages.change_signoff') def signoffs(request): signoff_groups = sorted(get_signoff_groups(), key=attrgetter('pkgbase')) for group in signoff_groups: @@ -29,7 +29,7 @@ def signoffs(request): } return render(request, 'packages/signoffs.html', context) -@permission_required('main.change_package') +@permission_required('packages.change_signoff') @never_cache def signoff_package(request, name, repo, arch, revoke=False): packages = get_list_or_404(Package, pkgbase=name, @@ -173,7 +173,7 @@ def default(self, obj): return list(obj) return super(SignoffJSONEncoder, self).default(obj) -@permission_required('main.change_package') +@permission_required('packages.change_signoff') def signoffs_json(request): signoff_groups = sorted(get_signoff_groups(), key=attrgetter('pkgbase')) data = {