2 files changed, 6 insertions, 1 deletions
diff --git a/python/fatcat_web/editing_routes.py b/python/fatcat_web/editing_routes.py
index 29db3443..c07ee81f 100644
--- a/python/fatcat_web/editing_routes.py
+++ b/python/fatcat_web/editing_routes.py
@@ -30,7 +30,9 @@ def form_editgroup_get_or_create(api, edit_form):
                 return None
             app.log.warning(ae)
             abort(ae.status)
-        # TODO: check here that editgroup hasn't been merged already
+        if eg.changelog_index:
+            edit_form.editgroup_id.errors.append("Editgroup has already been accepted")
+            return None
     else:
         # if no editgroup, create one from description
         try:
diff --git a/python/fatcat_web/routes.py b/python/fatcat_web/routes.py
index 422d121e..c3467a61 100644
--- a/python/fatcat_web/routes.py
+++ b/python/fatcat_web/routes.py
@@ -382,6 +382,9 @@ def editgroup_accept(ident):
     except ApiException as ae:
         app.log.info(ae)
         abort(ae.status)
+    # clear active_editgroup_id cookie; this doesn't cover all cases
+    if eg.editgroup_id == session.get('active_editgroup_id'):
+        session.pop('active_editgroup_id')
     return redirect('/editgroup/{}'.format(ident))
 
 @app.route('/editgroup/<ident>/unsubmit', methods=['POST'])