From b8223b83c1a8b2740ce2777d9c232e3f36260d6e Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Mar 29 2021 10:03:49 +0000 Subject: [PATCH 1/2] Adjust the code checking FPCA and CLA+1 for the new AAA system Signed-off-by: Pierre-Yves Chibon --- diff --git a/fedocal/__init__.py b/fedocal/__init__.py index 1ab3355..cfda2c9 100644 --- a/fedocal/__init__.py +++ b/fedocal/__init__.py @@ -137,20 +137,21 @@ work. if not authenticated(): return flask.redirect(flask.url_for('auth_login', next=flask.request.url)) - elif not flask.g.fas_user.cla_done: - flask.flash( - gettext('You must sign the CLA (Contributor License' + elif "signed_fpca" not in (flask.g.fas_user.groups or []): + flask.flash( + gettext('You must sign the CLA (Contributor License' ' Agreement) to use fedocal'), + + ) + return flask.redirect(flask.url_for('index')) + elif "signed_fpca" in (flask.g.fas_user.groups or []) and len(flask.g.fas_user.groups or []) < 2: + flask.flash( + gettext('You must be in one more group than the CLA'), + 'errors' 'errors' ) return flask.redirect(flask.url_for('.index')) - else: - if len(flask.g.fas_user.groups) == 0: - flask.flash( - gettext('You must be in one more group than the CLA'), - 'errors' - ) - return flask.redirect(flask.url_for('index')) + return function(*args, **kwargs) return decorated_function From 52b4948b414fef55c4427410a241e4d49a9e285a Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Mar 29 2021 13:02:03 +0000 Subject: [PATCH 2/2] Fix the topic of the message sent for the reminders Signed-off-by: Pierre-Yves Chibon --- diff --git a/fedocal_cron.py b/fedocal_cron.py index cbaa055..4d4baff 100644 --- a/fedocal_cron.py +++ b/fedocal_cron.py @@ -55,7 +55,7 @@ def fedmsg_publish(meeting, meeting_id): meeting=meeting_dict, calendar=meeting.calendar.to_json() ) - fedmsg.publish(topic='reminder', msg=message) + fedmsg.publish(topic='meeting.reminder', msg=message) def send_reminder_meeting(meeting, meeting_id):