From 884b1e02a7bc2442845d00387ef5dac1ec09c2e7 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Wed, 15 Sep 2021 19:01:53 -0500 Subject: [PATCH] Invoke handler when request is made to merge 2 people --- tailbone/views/people.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tailbone/views/people.py b/tailbone/views/people.py index 5b4064b3..0613d3d7 100644 --- a/tailbone/views/people.py +++ b/tailbone/views/people.py @@ -33,7 +33,7 @@ import sqlalchemy as sa from sqlalchemy import orm from rattail.db import model, api -from rattail.time import localtime, make_utc +from rattail.time import localtime from rattail.util import OrderedDict import colander @@ -730,12 +730,9 @@ class PersonView(MasterView): """ Create a new merge request for the given 2 people. """ - merge = self.model.MergePeopleRequest() - merge.removing_uuid = self.request.POST['removing_uuid'] - merge.keeping_uuid = self.request.POST['keeping_uuid'] - merge.requested_by = self.request.user - merge.requested = make_utc() - self.Session.add(merge) + self.handler.request_merge(self.request.user, + self.request.POST['removing_uuid'], + self.request.POST['keeping_uuid']) return self.redirect(self.get_index_url()) @classmethod