arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-28 02:42:17 +00:00
Code Issues Projects Releases Wiki Activity

FIX: Require login on events and event embeds again

Browse Source 
Little too far to the open side there Arona... Whooooooops!
This commit is contained in:
FreneticScribbler
2020-01-11 20:24:37 +00:00
parent ea12bfa607
commit 0ee393725e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
RIGS/forms.py
View File

@@ -36,9 +36,10 @@ class ProfileRegistrationFormUniqueEmail(RegistrationFormUniqueEmail):
class CheckApprovedForm(AuthenticationForm): class CheckApprovedForm(AuthenticationForm):
def confirm_login_allowed(self, user): def confirm_login_allowed(self, user):
if not user.is_approved and not user.is_superuser: if user.is_approved or user.is_superuser:
return AuthenticationForm.confirm_login_allowed(self, user)
else:
raise forms.ValidationError("Your account hasn't been approved by an administrator yet. Please check back in a few minutes!") raise forms.ValidationError("Your account hasn't been approved by an administrator yet. Please check back in a few minutes!")
return AuthenticationForm.confirm_login_allowed(self, user)
# Embedded Login form - remove the autofocus # Embedded Login form - remove the autofocus

2
RIGS/urls.py
View File

@@ -87,7 +87,7 @@ urlpatterns = [
login_required()(versioning.ActivityFeed.as_view()), login_required()(versioning.ActivityFeed.as_view()),
name='activity_feed'), name='activity_feed'),
url(r'^event/(?P<pk>\d+)/$', ( url(r'^event/(?P<pk>\d+)/$', permission_required_with_403('', oembed_view="event_oembed")(
rigboard.EventDetail.as_view()), rigboard.EventDetail.as_view()),
name='event_detail'), name='event_detail'),
url(r'^event/(?P<pk>\d+)/embed/$', url(r'^event/(?P<pk>\d+)/embed/$',