Target key forms: choose whom to associated with (refs #3725)

1 files changed, 13 insertions, 2 deletions

diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index d56165bf4..d2ff49a36 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -1663,6 +1663,11 @@ class NewImportView(IshtarMixin, LoginRequiredMixin, CreateView):
     def get_success_url(self):
         return reverse('current_imports')
 
+    def get_form_kwargs(self):
+        kwargs = super(NewImportView, self).get_form_kwargs()
+        kwargs['user'] = self.request.user
+        return kwargs
+
     def form_valid(self, form):
         user = models.IshtarUser.objects.get(pk=self.request.user.pk)
         self.object = form.save(user=user)
@@ -1723,18 +1728,24 @@ class ImportOldListView(ImportListView):
 
 
 class ImportLinkView(IshtarMixin, LoginRequiredMixin, ModelFormSetView):
-    template_name = 'ishtar/formset.html'
+    template_name = 'ishtar/formset_import_match.html'
     model = models.TargetKey
     page_name = _(u"Link unmatched items")
     extra = 0
     form_class = forms.TargetKeyForm
+    formset_class = forms.TargetKeyFormset
+
+    def get_formset_kwargs(self):
+        kwargs = super(ImportLinkView, self).get_formset_kwargs()
+        kwargs['user'] = self.request.user
+        return kwargs
 
     def get_queryset(self):
         return self.model.objects.filter(
             is_set=False, associated_import=self.kwargs['pk'])
 
     def get_success_url(self):
-        return reverse('current_imports')
+        return reverse('import_link_unmatched', args=[self.kwargs['pk']])
 
 
 class ImportDeleteView(IshtarMixin, LoginRequiredMixin, DeleteView):