Rebase migrations

1 files changed, 40 insertions, 3 deletions

diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 5d2b442bf..187712676 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -2483,12 +2483,49 @@ class OrganizationPersonEdit(LoginRequiredMixin, UpdateView):
     def get_success_url(self):
         return reverse('organization_person_edit', args=[self.object.pk])
 
+
+# documents
+
+show_document = show_item(models.Document, 'document')
+get_document = get_item(models.Document, 'get_document', 'document')
+
+
+document_search_wizard = wizards.SearchWizard.as_view(
+    [('selec-document_search', forms.DocumentFormSelection)],
+    label=_(u"Document: search"),
+    url_name='document_search',
+)
+
+
+class NewDocumentFormView(IshtarMixin, LoginRequiredMixin,
+                          FormView):
+    form_class = forms.DocumentForm
+    template_name = 'ishtar/form.html'
+    success_url = 'document_search'
+
 """
+class DocumentSelectMixin(IshtarMixin, LoginRequiredMixin,
+                          FormView):
+    form_class = forms.PersonMergeFormSelection
+    template_name = 'ishtar/form.html'
+    redir_url = 'person_manual_merge_items'
+
+    def form_valid(self, form):
+        self.item = form.get_item()
+        return super(ManualMergeMixin, self).form_valid(form)
+
+    def get_success_url(self):
+        return reverse(self.redir_url, args=[self.item.pk])
 
-show_operationsource = show_item(models.OperationSource, 'operationsource')
-get_operationsource = get_item(models.OperationSource, 'get_operationsource',
-                               'operationsource')
 
+class DocumentSelectView(DocumentSelectMixin, IshtarMixin, LoginRequiredMixin,
+                         FormView):
+    page_name = _(u"Merge persons")
+    current_url = 'person-manual-merge'
+    redir_url = 'person_manual_merge_items'
+"""
+
+"""
 # operation sources
 
 operation_source_search_wizard = SearchWizard.as_view([