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

FIX: updated oneclickaction to suit the changes i did about event state.

Browse Source
This commit is contained in:
heinzel
2018-07-09 15:05:20 +02:00
parent 3c7ef05099
commit ae4b842983
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
dav_events/models/oneclickaction.py
View File

@@ -62,19 +62,20 @@ 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)
number = event.accept(user) flag = event.flags.filter(status__code='accepted').first()
if number: if flag:
status = 'success'
message = ugettext(u'Veranstaltung freigegeben.')
text = unicode(event)
else:
status = 'info' status = 'info'
message = (ugettext(u'Veranstaltung wurde bereits von %(fullname)s freigegeben.') % message = (ugettext(u'Veranstaltung wurde bereits von %(fullname)s freigegeben.') %
{'fullname': event.accepted_by.get_full_name()}) {'fullname': flag.user.get_full_name()})
text = unicode(event) text = unicode(event)
text += u'\n' text += u'\n'
text += (ugettext(u'Freigegeben am: %(date)s') % text += (ugettext(u'Freigegeben am: %(date)s') %
{'date': event.accepted_at.strftime('%d.%m.%Y %H:%M:%S')}) {'date': flag.timestamp.strftime('%d.%m.%Y %H:%M:%S')})
else:
event.confirm_status('accepted', user)
status = 'success'
message = ugettext(u'Veranstaltung freigegeben.')
text = unicode(event)
self.done = True self.done = True
self.done_at = timezone.now() self.done_at = timezone.now()
@@ -95,16 +96,21 @@ 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.publication_confirmed: flag = event.flags.filter(status__code__in=('publishing', 'published')).first()
if flag:
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.publication_confirmed_by.get_full_name()}) {'fullname': flag.user.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.publication_confirmed_at.strftime('%d.%m.%Y %H:%M:%S')}) {'date': flag.timestamp.strftime('%d.%m.%Y %H:%M:%S')})
else: else:
event.confirm_publication(user) if event.planned_publication_date:
new_state = 'publishing'
else:
new_state = 'published'
event.confirm_status(new_state, user)
status = 'success' status = 'success'
message = ugettext(u'Veröffentlichung registriert.') message = ugettext(u'Veröffentlichung registriert.')
text = unicode(event) text = unicode(event)