DAV-KA/django-dav-events
1
0
Fork 0
Code Issues 24 Pull Requests Actions Releases Wiki Activity

Publish workflow is now fully functional.

Browse Source
This commit is contained in:
heinzel
2018-02-26 14:44:30 +01:00
parent 87787c5eea
commit 69204a6d0d
16 changed files with 114 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
TODO.txt
View File

@@ -14,7 +14,6 @@
- erster teil des anmeldungshowto editierbar - erster teil des anmeldungshowto editierbar
- feld 'anmeldung nicht nötig' - feld 'anmeldung nicht nötig'
- publizierendes feld für redaktionellen hinweis - publizierendes feld für redaktionellen hinweis
- status veröffentlicht
- für heft: wochentage abkürzen - für heft: wochentage abkürzen
- vortreffen ohne datum? - vortreffen ohne datum?

6
dav_events/emails.py
View File

@@ -134,13 +134,13 @@ class EventAcceptedMail(AbstractEventMail):
class EventToPublishMail(AbstractEventMail): class EventToPublishMail(AbstractEventMail):
_template_name = 'dav_events/emails/event_to_publish.txt' _template_name = 'dav_events/emails/event_to_publish.txt'
def __init__(self, set_published_action=None, *args, **kwargs): def __init__(self, confirm_publication_action=None, *args, **kwargs):
self._set_published_action = set_published_action self._confirm_publication_action = confirm_publication_action
super(EventToPublishMail, self).__init__(*args, **kwargs) super(EventToPublishMail, self).__init__(*args, **kwargs)
def _get_context_data(self, extra_context=None): def _get_context_data(self, extra_context=None):
context = super(EventToPublishMail, self)._get_context_data(extra_context=extra_context) context = super(EventToPublishMail, self)._get_context_data(extra_context=extra_context)
context['set_published_url'] = self._set_published_action.get_absolute_url() context['confirm_publication_url'] = self._confirm_publication_action.get_absolute_url()
return context return context
def _get_subject(self, **kwargs): def _get_subject(self, **kwargs):

20
dav_events/forms/events.py
View File

@@ -71,7 +71,7 @@ class EventUpdateForm(forms.ModelForm):
model = models.Event model = models.Event
fields = '__all__' fields = '__all__'
exclude = ('accepted', 'accepted_at', 'accepted_by', exclude = ('accepted', 'accepted_at', 'accepted_by',
'published', 'published_at', 'published_by',) 'publication_confirmed', 'publication_confirmed_at', 'publication_confirmed_by',)
class EventCreateForm(ModelMixin, ChainedForm): class EventCreateForm(ModelMixin, ChainedForm):
@@ -815,10 +815,10 @@ class ChargesForm(EventCreateForm):
class SummaryForm(EventCreateForm): class SummaryForm(EventCreateForm):
_form_title = _(u'Zusammenfassung') _form_title = _(u'Zusammenfassung')
planned_publish_date = forms.DateField(required=False, planned_publication_date = forms.DateField(required=False,
label=_(u'Voraussichtliche Veröffentlichung'), label=_(u'Voraussichtliche Veröffentlichung'),
widget=forms.HiddenInput()) widget=forms.HiddenInput())
planned_publish_issue = forms.CharField(required=False) planned_publication_issue = forms.CharField(required=False)
internal_note = forms.CharField(required=False, internal_note = forms.CharField(required=False,
label=_(u'Bearbeitungshinweis'), label=_(u'Bearbeitungshinweis'),
@@ -841,10 +841,10 @@ class SummaryForm(EventCreateForm):
deadline = None deadline = None
if deadline: if deadline:
publish_deadline = deadline - datetime.timedelta(app_config.settings.publish_before_deadline_days) publication_deadline = deadline - datetime.timedelta(app_config.settings.publish_before_deadline_days)
else: else:
first_day = self._session_data.get('first_day') first_day = self._session_data.get('first_day')
publish_deadline = first_day - datetime.timedelta(app_config.settings.publish_before_begin_days) publication_deadline = first_day - datetime.timedelta(app_config.settings.publish_before_begin_days)
today = datetime.date.today() today = datetime.date.today()
@@ -863,9 +863,9 @@ class SummaryForm(EventCreateForm):
if issue_deadline > issue_release: if issue_deadline > issue_release:
issue_deadline = datetime.date(year - 1, issue['deadline'][1], issue['deadline'][0]) issue_deadline = datetime.date(year - 1, issue['deadline'][1], issue['deadline'][0])
if publish_deadline > issue_release and today < issue_deadline: if publication_deadline > issue_release and today < issue_deadline:
self.fields['planned_publish_date'].initial = issue_release self.fields['planned_publication_date'].initial = issue_release
self.fields['planned_publish_issue'].initial = u'%s/%s' % (issue['issue'], year) self.fields['planned_publication_issue'].initial = u'%s/%s' % (issue['issue'], year)
break_outer_loop = True break_outer_loop = True
break break

40
dav_events/migrations/0015_auto_20180226_1253.py Normal file
View File

@@ -0,0 +1,40 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.9 on 2018-02-26 12:53
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('dav_events', '0014_auto_20180225_1757'),
]
operations = [
migrations.RenameField(
model_name='event',
old_name='planned_publish_date',
new_name='planned_publication_date',
),
migrations.RenameField(
model_name='event',
old_name='published',
new_name='publication_confirmed',
),
migrations.RenameField(
model_name='event',
old_name='published_at',
new_name='publication_confirmed_at',
),
migrations.RenameField(
model_name='event',
old_name='published_by',
new_name='publication_confirmed_by',
),
migrations.AlterField(
model_name='oneclickaction',
name='command',
field=models.CharField(choices=[(b'EA', b'accept event'), (b'EP', b'confirm publication of an event'), (b'EL', b'login and go to event list')], max_length=2),
),
]

62
dav_events/models.py
View File

@@ -46,14 +46,14 @@ class Event(models.Model):
blank=True, blank=True,
null=True, null=True,
default=None) default=None)
published = models.BooleanField(default=False) publication_confirmed = models.BooleanField(default=False)
published_at = models.DateTimeField(blank=True, publication_confirmed_at = models.DateTimeField(blank=True,
null=True) null=True)
published_by = models.ForeignKey(settings.AUTH_USER_MODEL, publication_confirmed_by = models.ForeignKey(settings.AUTH_USER_MODEL,
blank=True, blank=True,
null=True, null=True,
on_delete=models.SET(get_ghost_user), on_delete=models.SET(get_ghost_user),
related_name='+') related_name='+')
# DescriptionForm # DescriptionForm
title = models.CharField(max_length=config.TITLE_MAX_LENGTH) title = models.CharField(max_length=config.TITLE_MAX_LENGTH)
@@ -163,8 +163,8 @@ class Event(models.Model):
blank=True) blank=True)
# SummaryForm # SummaryForm
planned_publish_date = models.DateField(blank=True, planned_publication_date = models.DateField(blank=True,
null=True) null=True)
internal_note = models.TextField(blank=True) internal_note = models.TextField(blank=True)
class Meta: class Meta:
@@ -235,7 +235,7 @@ class Event(models.Model):
action = OneClickAction(command='EP') action = OneClickAction(command='EP')
action.parameters = '{event},{user}'.format(event=self.id, user=user.id) action.parameters = '{event},{user}'.format(event=self.id, user=user.id)
action.save() action.save()
email = emails.EventToPublishMail(recipient=user, event=self, set_published_action=action) email = emails.EventToPublishMail(recipient=user, event=self, confirm_publication_action=action)
email.send() email.send()
email = emails.EventAcceptedMail(recipient=self.owner, event=self) email = emails.EventAcceptedMail(recipient=self.owner, event=self)
@@ -245,35 +245,37 @@ class Event(models.Model):
else: else:
return None return None
def set_published(self, user=None): def confirm_publication(self, user=None):
if not self.accepted: if not self.accepted:
logger.warning('Event.set_published(): event is not accepted yet! (Event: %s)', self.event) logger.warning('Event.confirm_publication(): event is not accepted yet! (Event: %s)', self.event)
if not self.published: if not self.publication_confirmed:
self.published = True self.publication_confirmed = True
self.published_at = timezone.now() self.publication_confirmed_at = timezone.now()
if user: if user:
self.published_by = user self.publication_confirmed_by = user
else: else:
logger.warning('Event.set_published(): no user given! (Event: %s)', self.event) logger.warning('Event.confirm_publication(): no user given! (Event: %s)', self.event)
self.save() self.save()
logger.info('Event is published: %s', self) logger.info('Event is published: %s', self)
def get_status(self): def get_status(self):
now = datetime.date.today() today = datetime.date.today()
if self.alt_last_day: if self.alt_last_day:
if self.alt_last_day < now: if self.alt_last_day < today:
return 'expired' return 'expired'
elif self.last_day: elif self.last_day:
if self.last_day < now: if self.last_day < today:
return 'expired' return 'expired'
elif self.alt_first_day: elif self.alt_first_day:
if self.alt_first_day < now: if self.alt_first_day < today:
return 'expired' return 'expired'
elif self.first_day and self.first_day < now: elif self.first_day and self.first_day < today:
return 'expired' return 'expired'
if self.published: if self.publication_confirmed and self.planned_publication_date and self.planned_publication_date > today:
return 'publishing'
elif self.publication_confirmed:
return 'published' return 'published'
elif self.accepted: elif self.accepted:
return 'accepted' return 'accepted'
@@ -413,7 +415,7 @@ class Event(models.Model):
'trainer_3_email': self.trainer_3_email, 'trainer_3_email': self.trainer_3_email,
'trainer_3_phone': self.trainer_3_phone, 'trainer_3_phone': self.trainer_3_phone,
'registration_howto': self.registration_howto, 'registration_howto': self.registration_howto,
'planned_publish_date': self.planned_publish_date, 'planned_publication_date': self.planned_publication_date,
'internal_note': self.internal_note, 'internal_note': self.internal_note,
} }
return context return context
@@ -432,7 +434,7 @@ class Event(models.Model):
class OneClickAction(models.Model): class OneClickAction(models.Model):
COMMANDS = ( COMMANDS = (
('EA', 'accept event'), ('EA', 'accept event'),
('EP', 'report publishing of an event'), ('EP', 'confirm publication of an event'),
('EL', 'login and go to event list') ('EL', 'login and go to event list')
) )
@@ -512,16 +514,16 @@ class OneClickAction(models.Model):
event_id, user_id = self.parameters.split(',') event_id, user_id = self.parameters.split(',')
event = Event.objects.get(id=event_id) event = Event.objects.get(id=event_id)
user = get_user_model().objects.get(id=user_id) user = get_user_model().objects.get(id=user_id)
if event.published: if event.publication_confirmed:
status = 'info' status = 'info'
message = (ugettext(u'Veröffentlichung wurde bereits von %(fullname)s bestätigt.') % message = (ugettext(u'Veröffentlichung wurde bereits von %(fullname)s bestätigt.') %
{'fullname': event.published_by.get_full_name()}) {'fullname': event.publication_confirmed_by.get_full_name()})
text = unicode(event) text = unicode(event)
text += u'\n' text += u'\n'
text += (ugettext(u'Bestätigt am: %(date)s') % text += (ugettext(u'Bestätigt am: %(date)s') %
{'date': event.published_at.strftime('%d.%m.%Y %H:%M:%S')}) {'date': event.publication_confirmed_at.strftime('%d.%m.%Y %H:%M:%S')})
else: else:
event.set_published(user) event.confirm_publication(user)
status = 'success' status = 'success'
message = ugettext(u'Veröffentlichung registriert.') message = ugettext(u'Veröffentlichung registriert.')
text = unicode(event) text = unicode(event)

2
dav_events/templates/dav_events/emails/event_accepted.txt
View File

@@ -6,6 +6,6 @@ Die Redaktion wurden informiert, um deine Veranstaltung zu veröffentlichen.
Link zur Veranstaltung: Link zur Veranstaltung:
{{ base_url }}{{ event.get_absolute_url }} {{ base_url }}{{ event.get_absolute_url }}
Voraussichtliche Veröffentlichung: {% if planned_publish_date %}{{ planned_publish_date|date:'l, d. F Y' }}{% else %}In wenigen Tagen{% endif %} Voraussichtliche Veröffentlichung: {% if planned_publication_date %}{{ planned_publication_date|date:'l, d. F Y' }}{% else %}In wenigen Tagen{% endif %}
----- -----
{{ event.render_as_text }}----- {{ event.render_as_text }}-----

2
dav_events/templates/dav_events/emails/event_to_accept.txt
View File

@@ -7,7 +7,7 @@ Der folgende Link führt zur Veranstaltung:
Über den folgenden Link kannst du die Veranstaltung unmittelbar freigeben: Über den folgenden Link kannst du die Veranstaltung unmittelbar freigeben:
{{ base_url }}{{ accept_url }} {{ base_url }}{{ accept_url }}
Veröffentlichung: {% if planned_publish_date %}{{ planned_publish_date|date:'l, d. F Y' }}{% else %}sofort{% endif %} Veröffentlichung: {% if planned_publication_date %}{{ planned_publication_date|date:'l, d. F Y' }}{% else %}sofort{% endif %}
{% if internal_note %}Bearbeitungshinweis: {% if internal_note %}Bearbeitungshinweis:
{{ internal_note }} {{ internal_note }}
{% endif %}----- {% endif %}-----

4
dav_events/templates/dav_events/emails/event_to_publish.txt
View File

@@ -6,9 +6,9 @@ Die Veranstaltung wurde {% if event.accepted_by %}von {{ event.accepted_by.get_f
Der folgende Link führt zur Veranstaltung: Der folgende Link führt zur Veranstaltung:
{{ base_url }}{{ event.get_absolute_url }} {{ base_url }}{{ event.get_absolute_url }}
Über den folgenden Link kannst du die Veröffentlichung unmittelbar bestätigen: Über den folgenden Link kannst du die Veröffentlichung unmittelbar bestätigen:
{{ base_url }}{{ set_published_url }} {{ base_url }}{{ confirm_publication_url }}
Veröffentlichung: {% if planned_publish_date %}{{ planned_publish_date|date:'l, d. F Y' }}{% else %}sofort{% endif %} Veröffentlichung: {% if planned_publication_date %}{{ planned_publication_date|date:'l, d. F Y' }}{% else %}sofort{% endif %}
{% if internal_note %}Bearbeitungshinweis: {% if internal_note %}Bearbeitungshinweis:
{{ internal_note }} {{ internal_note }}
{% endif %}----- Plain Text ----- {% endif %}----- Plain Text -----

2
dav_events/templates/dav_events/emails/new_event.txt
View File

@@ -6,7 +6,7 @@ Die entsprechenden Referenten wurden informiert, um deine Veranstaltung frei zu
Link zur Veranstaltung: Link zur Veranstaltung:
{{ base_url }}{{ event.get_absolute_url }} {{ base_url }}{{ event.get_absolute_url }}
Voraussichtliche Veröffentlichung: {% if planned_publish_date %}{{ planned_publish_date|date:'l, d. F Y' }}{% else %}In wenigen Tagen{% endif %} Voraussichtliche Veröffentlichung: {% if planned_publication_date %}{{ planned_publication_date|date:'l, d. F Y' }}{% else %}In wenigen Tagen{% endif %}
----- -----
{{ event.render_as_text }}----- {{ event.render_as_text }}-----
{% if internal_note %}Bearbeitungshinweis: {% if internal_note %}Bearbeitungshinweis:

2
dav_events/templates/dav_events/event.html
View File

@@ -7,6 +7,8 @@
<span class="label label-info">{% trans 'Ausgelaufen' %}</span> <span class="label label-info">{% trans 'Ausgelaufen' %}</span>
{% elif status == 'published' %} {% elif status == 'published' %}
<span class="label label-success">{% trans 'Veröffentlicht' %}</span> <span class="label label-success">{% trans 'Veröffentlicht' %}</span>
{% elif status == 'publishing' %}
<span class="label label-warning">{% trans 'Veröffentlichung' %}: {{ event.planned_publication_date|date:'d.m.Y' }}</span>
{% elif status == 'accepted' %} {% elif status == 'accepted' %}
<span class="label label-warning">{% trans 'Freigegeben' %}</span> <span class="label label-warning">{% trans 'Freigegeben' %}</span>
{% elif status == 'submitted' %} {% elif status == 'submitted' %}

6
dav_events/templates/dav_events/event_create/SummaryForm.html
View File

@@ -10,9 +10,9 @@
<div class="col-sm-4"> <div class="col-sm-4">
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<label>{{ form.planned_publish_date.label }}</label> <label>{{ form.planned_publication_date.label }}</label>
{% if form.planned_publish_date.value %} {% if form.planned_publication_date.value %}
<p>{{ form.planned_publish_date.value|date:'l, d. F Y' }} ({{ form.planned_publish_issue.value }})</p> <p>{{ form.planned_publication_date.value|date:'l, d. F Y' }} ({{ form.planned_publication_issue.value }})</p>
{% else %} {% else %}
<p>{% trans 'In wenigen Tagen' %}</p> <p>{% trans 'In wenigen Tagen' %}</p>
{% endif %} {% endif %}

20
dav_events/templates/dav_events/event_detail.html
View File

@@ -30,7 +30,7 @@
</div> </div>
</div> </div>
</div> </div>
<div id="modal-setpublished-dialog" class="modal fade" tabindex="-1" role="dialog"> <div id="modal-confirmpublication-dialog" class="modal fade" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
@@ -43,7 +43,7 @@
</p> </p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-success" href="{% url 'dav_events:event_setpublished' event.pk %}"> <a class="btn btn-success" href="{% url 'dav_events:event_confirmpublication' event.pk %}">
{% bootstrap_icon 'ok' %}&thinsp; {% bootstrap_icon 'ok' %}&thinsp;
{% trans 'Ja' %} {% trans 'Ja' %}
</a> </a>
@@ -81,8 +81,8 @@
{% endif %} {% endif %}
{% if has_permission_publish %} {% if has_permission_publish %}
<a class="btn {% if event.get_status == 'accepted' %}btn-success{% else %}btn-default disabled{% endif %}" <a class="btn {% if event.get_status == 'accepted' %}btn-success{% else %}btn-default disabled{% endif %}"
data-toggle="modal" data-target="#modal-setpublished-dialog"> data-toggle="modal" data-target="#modal-confirmpublication-dialog">
{% if event.published %} {% if event.publication_confirmed %}
{% bootstrap_icon 'check' %}&thinsp; {% bootstrap_icon 'check' %}&thinsp;
{% else %} {% else %}
{% bootstrap_icon 'unchecked' %}&thinsp; {% bootstrap_icon 'unchecked' %}&thinsp;
@@ -144,7 +144,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-4"> <div class="col-sm-4">
{% if event.published %} {% if event.publication_confirmed %}
<span class="text-success">{% bootstrap_icon 'check' %}</span> <span class="text-success">{% bootstrap_icon 'check' %}</span>
{% else %} {% else %}
{% bootstrap_icon 'unchecked' %} {% bootstrap_icon 'unchecked' %}
@@ -152,9 +152,9 @@
&thinsp;<strong>{% trans 'Veröffentlicht' %}:</strong> &thinsp;<strong>{% trans 'Veröffentlicht' %}:</strong>
</div> </div>
<div class="col-sm-8"> <div class="col-sm-8">
{% if event.published %} {% if event.publication_confirmed %}
{{ event.published_at|date:'l, d. F Y, H:i' }} {% trans 'Uhr' %}<br /> {{ event.publication_confirmed_at|date:'l, d. F Y, H:i' }} {% trans 'Uhr' %}<br />
{% trans 'von' %} {{ event.published_by.get_full_name }} {% trans 'von' %} {{ event.publication_confirmed_by.get_full_name }}
{% else %} {% else %}
<br /><br /> <br /><br />
{% endif %} {% endif %}
@@ -163,8 +163,8 @@
</div> </div>
<div class="col-sm-3"> <div class="col-sm-3">
<strong>{% trans 'Veröffentlichen' %}</strong><br /> <strong>{% trans 'Veröffentlichen' %}</strong><br />
{% if event.planned_publish_date %} {% if event.planned_publication_date %}
{{ event.planned_publish_date|date:'l, d. F Y' }} {{ event.planned_publication_date|date:'l, d. F Y' }}
{% else %} {% else %}
{% trans 'Unverzüglich' %} {% trans 'Unverzüglich' %}
{% endif %} {% endif %}

2
dav_events/templates/dav_events/event_list.html
View File

@@ -65,6 +65,8 @@
<span class="label label-info">{% trans 'Ausgelaufen' %}</span> <span class="label label-info">{% trans 'Ausgelaufen' %}</span>
{% elif event.get_status == 'published' %} {% elif event.get_status == 'published' %}
<span class="label label-success">{% trans 'Veröffentlicht' %}</span> <span class="label label-success">{% trans 'Veröffentlicht' %}</span>
{% elif event.get_status == 'publishing' %}
<span class="label label-warning">{% trans 'Veröffentlichung' %}: {{ event.planned_publication_date|date:'d.m.Y' }}</span>
{% elif event.get_status == 'accepted' %} {% elif event.get_status == 'accepted' %}
<span class="label label-warning">{% trans 'Freigegeben' %}</span> <span class="label label-warning">{% trans 'Freigegeben' %}</span>
{% elif event.get_status == 'submitted' %} {% elif event.get_status == 'submitted' %}

4
dav_events/templates/dav_events/event_update_form.html
View File

@@ -26,10 +26,10 @@
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button> <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
{% trans 'Diese Veranstaltung ist bereits ausgelaufen.' %} {% trans 'Diese Veranstaltung ist bereits ausgelaufen.' %}
</div> </div>
{% elif event.get_status == 'published' %} {% elif event.get_status == 'published' or event.get_status == 'publishing' %}
<div class="alert alert-danger alert-dismissible" role="alert"> <div class="alert alert-danger alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button> <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<strong>{% trans 'Achtung!' %}</strong> {% trans 'Diese Veranstaltung wurde bereits veröffentlicht.' %} <strong>{% trans 'Achtung!' %}</strong> {% trans 'Diese Veranstaltung wird/wurde bereits veröffentlicht.' %}
{% trans 'Änderungen müssen mit allen Beteiligten abgesprochen werden.' %} {% trans 'Änderungen müssen mit allen Beteiligten abgesprochen werden.' %}
</div> </div>
{% elif event.get_status == 'accepted' %} {% elif event.get_status == 'accepted' %}

3
dav_events/urls.py
View File

@@ -11,7 +11,8 @@ urlpatterns = [
url(r'^events/create$', views.events.EventCreateView.as_view(), name='event_create'), url(r'^events/create$', views.events.EventCreateView.as_view(), name='event_create'),
url(r'^events/export$', views.events.EventListExportView.as_view(), name='event_list_export'), url(r'^events/export$', views.events.EventListExportView.as_view(), name='event_list_export'),
url(r'^events/(?P<pk>\d+)/accept', views.events.EventAcceptView.as_view(), name='event_accept'), url(r'^events/(?P<pk>\d+)/accept', views.events.EventAcceptView.as_view(), name='event_accept'),
url(r'^events/(?P<pk>\d+)/setpublished', views.events.EventSetPublishedView.as_view(), name='event_setpublished'), url(r'^events/(?P<pk>\d+)/confirmpublication',
views.events.EventConfirmPublicationView.as_view(), name='event_confirmpublication'),
url(r'^events/(?P<pk>\d+)/edit', views.events.EventUpdateView.as_view(), name='event_update'), url(r'^events/(?P<pk>\d+)/edit', views.events.EventUpdateView.as_view(), name='event_update'),
url(r'^events/(?P<pk>\d+)/', views.events.EventDetailView.as_view(), name='event_detail'), url(r'^events/(?P<pk>\d+)/', views.events.EventDetailView.as_view(), name='event_detail'),
url(r'^action/(?P<pk>[a-fA-F0-9]{8}-([a-fA-F0-9]{4}-){3}[a-fA-F0-9]{12})/', url(r'^action/(?P<pk>[a-fA-F0-9]{8}-([a-fA-F0-9]{4}-){3}[a-fA-F0-9]{12})/',

6
dav_events/views/events.py
View File

@@ -127,7 +127,7 @@ class EventPermissionMixin(object):
if has_role(user, 'manage_{}'.format(obj.sport.lower())): if has_role(user, 'manage_{}'.format(obj.sport.lower())):
return True return True
elif permission == 'update': elif permission == 'update':
if not obj.accepted and not obj.published: if not obj.accepted and not obj.publication_confirmed:
if has_role(user, 'manage_all'): if has_role(user, 'manage_all'):
return True return True
if has_role(user, 'manage_{}'.format(obj.sport.lower())): if has_role(user, 'manage_{}'.format(obj.sport.lower())):
@@ -177,13 +177,13 @@ class EventAcceptView(EventDetailView):
return HttpResponseRedirect(event.get_absolute_url()) return HttpResponseRedirect(event.get_absolute_url())
class EventSetPublishedView(EventDetailView): class EventConfirmPublicationView(EventDetailView):
permission = 'publish' permission = 'publish'
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
event = self.get_object() event = self.get_object()
if event.accepted: if event.accepted:
event.set_published(request.user) event.confirm_publication(request.user)
messages.success(request, _(u'Veröffentlichung registriert.')) messages.success(request, _(u'Veröffentlichung registriert.'))
else: else:
messages.error(request, _(u'Veranstaltung ist noch nicht freigegeben.')) messages.error(request, _(u'Veranstaltung ist noch nicht freigegeben.'))