From 66c8a75c32f4e3821181ca2ef1dd93c4f1038dfa Mon Sep 17 00:00:00 2001
From: Daniel Grams <grams.daniel@gmail.com>
Date: Wed, 14 Oct 2020 18:01:20 +0200
Subject: [PATCH] Bugfixes

---
 access.py                         | 1 +
 services/event.py                 | 1 +
 views/event.py                    | 5 +++--
 views/reference.py                | 2 +-
 views/reference_request_review.py | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/access.py b/access.py
index d95fca5..e8ab110 100644
--- a/access.py
+++ b/access.py
@@ -1,3 +1,4 @@
+from flask import abort
 from flask_security import current_user
 from flask_security.utils import FsPermNeed
 from flask_principal import Permission
diff --git a/services/event.py b/services/event.py
index 5386cec..ff6f81b 100644
--- a/services/event.py
+++ b/services/event.py
@@ -2,6 +2,7 @@ from models import EventReviewStatus, EventCategory, Event, EventDate, EventRefe
 from dateutils import dates_from_recurrence_rule, today, date_add_time, date_set_end_of_day
 from sqlalchemy import and_, or_, not_, func
 from sqlalchemy.sql import extract
+from dateutil.relativedelta import relativedelta
 
 def upsert_event_category(category_name):
     result = EventCategory.query.filter_by(name = category_name).first()
diff --git a/views/event.py b/views/event.py
index 079716d..50631b5 100644
--- a/views/event.py
+++ b/views/event.py
@@ -1,6 +1,6 @@
 from app import app, db
 from models import User, Event, EventDate, EventReviewStatus, AdminUnit, AdminUnitMember, EventOrganizer, EventCategory
-from flask import render_template, flash, url_for, redirect, request, jsonify
+from flask import render_template, flash, url_for, redirect, request, jsonify, abort
 from flask_babelex import gettext
 from flask_security import auth_required
 from access import has_access, access_or_401, can_reference_event, has_admin_unit_member_permission
@@ -77,10 +77,11 @@ def event_delete(event_id):
             flash(gettext('Entered name does not match event name'), 'danger')
         else:
             try:
+                admin_unit_id = event.admin_unit.id
                 db.session.delete(event)
                 db.session.commit()
                 flash(gettext('Event successfully deleted'), 'success')
-                return redirect(url_for('manage_admin_unit_events', id=admin_unit, organizer_id=event.organizer_id))
+                return redirect(url_for('manage_admin_unit_events', id=admin_unit_id))
             except SQLAlchemyError as e:
                 db.session.rollback()
                 flash(handleSqlError(e), 'danger')
diff --git a/views/reference.py b/views/reference.py
index 042b65d..c0eef0d 100644
--- a/views/reference.py
+++ b/views/reference.py
@@ -2,7 +2,7 @@ from app import app, db
 from .utils import get_pagination_urls, flash_errors, handleSqlError
 from access import get_admin_unit_for_manage_or_404, get_admin_units_for_event_reference
 from forms.reference import CreateEventReferenceForm, UpdateEventReferenceForm, DeleteReferenceForm
-from flask import render_template, flash, redirect, url_for
+from flask import render_template, flash, redirect, url_for, abort
 from flask_babelex import gettext
 from flask_security import auth_required
 from models import EventReference, Event
diff --git a/views/reference_request_review.py b/views/reference_request_review.py
index 6784db4..411ec25 100644
--- a/views/reference_request_review.py
+++ b/views/reference_request_review.py
@@ -1,6 +1,6 @@
 from app import app, db
 from models import Event, EventDate, EventReferenceRequest, EventReferenceRequestReviewStatus, AdminUnitMember, User
-from flask import render_template, flash, url_for, redirect
+from flask import render_template, flash, url_for, redirect, abort
 from flask_babelex import gettext
 from flask_security import auth_required
 from access import has_access, access_or_401, can_reference_event, has_admin_unit_member_permission