Refactor split_doc view for class-based view and modify DocSplitForm to fit

Marcel Kawski
1 parent 69b6f284
Showing 3 changed files with 41 additions and 24 deletions
collector/storage/forms.py
collector/storage/urls.py
collector/storage/views.py
@@ -317,7 +317,7 @@ class KeywordForm(Form):
     label = CharField(max_length=200, label='Etykieta')
  
  
-class DocSplitForm(Form):
+class DocSplitForm(ModelForm):
     class ChunkChoiceField(ModelChoiceField):
         def label_from_instance(self, obj):
             return str(obj.sequence)
@@ -332,6 +332,11 @@ class DocSplitForm(Form):
         self.fields['chunk_end'].queryset = chunks
  
  
+    class Meta:
+        model = Document
+        fields = ['chunk_beg', 'chunk_end']
+
+
 class MoveChunkForm(ModelForm):
  
     def __init__(self, *args, **kwargs):
@@ -41,7 +41,7 @@ urlpatterns = [
     path('keyword/add/<str:doc_id>', login_required(views.add_keyword), name='add_keyword'),
     path('keyword/edit/<str:doc_id>/<int:pk>', login_required(views.edit_keyword), name='edit_keyword'),
     path('keyword/delete/<str:doc_id>/<int:pk>', login_required(views.delete_keyword), name='delete_keyword'),
-    path('split-doc/<str:doc_id>', login_required(views.split_doc), name='split_doc'),
+    path('split-doc/<int:pk>', login_required(views.DocSplitView.as_view()), name='split_doc'),
     path('move-subdoc/<str:subdoc_id>/<str:direction>', login_required(views.move_subdoc), name='move_subdoc'),
     path('revert-subdoc-division/<int:pk>/', login_required(views.RevertSubdocDivisionView.as_view()),
          name='revert_subdoc_division'),
@@ -311,7 +311,7 @@ class ChunkAddBetweenView(CreateView):
     def get_success_url(self):
         return '%s#chunk-%d' % (reverse_lazy('annotation', kwargs={'doc_id': self.kwargs['doc_id']}),
                                 self.object.pk)
-    
+
  
 class MoveChunkView(UpdateView):
     model = Chunk
@@ -855,26 +855,28 @@ class FinishAnnotationView(RedirectView):
         return super().get(request, *args, **kwargs)
  
  
-def split_doc(request, doc_id):
-    document = Document.objects.get(pk=doc_id)
-    chunks = document.chunks.all().order_by('sequence')
-    if request.method == 'POST':
-        form = DocSplitForm(request.POST, chunks=chunks)
-        if form.is_valid():
+class DocSplitView(UpdateView):
+    model = Document
+    template_name = 'storage/edit.html'
+    form_class = DocSplitForm
+
+    def form_valid(self, form):
+        if not self.request.is_ajax():
             chunk_beg = form.cleaned_data['chunk_beg'].sequence
             chunk_end = form.cleaned_data['chunk_end'].sequence
+            chunks = self.object.chunks.all().order_by('sequence')
             if chunk_end < chunk_beg:
-                messages.error(request, 'Błąd: Nieprawidłowy zakres sekcji.')
-                return HttpResponseRedirect(reverse('annotation', kwargs={'doc_id': doc_id}))
-            max_seq_doc = Document.objects.filter(parent=document).order_by('-sequence').first()
+                messages.error(self.request, 'Błąd: Nieprawidłowy zakres sekcji.')
+                return HttpResponseRedirect(reverse('annotation', kwargs={'doc_id': self.object.id}))
+            max_seq_doc = Document.objects.filter(parent=self.object).order_by('-sequence').first()
             if max_seq_doc is None:
                 sequence = 0
             else:
                 sequence = max_seq_doc.sequence
-            if document.parent is None:
-                parent = document
+            if self.object.parent is None:
+                parent = self.object
             else:
-                parent = document.parent
+                parent = self.object.parent
             new_document = Document.objects.create(name=parent.name,
                                                    lang=parent.lang,
                                                    original_lang=parent.original_lang,
@@ -889,15 +891,25 @@ def split_doc(request, doc_id):
                                                    sequence=sequence + 1)
             new_document.chunks.set(chunks.filter(sequence__range=(chunk_beg, chunk_end)))
             new_document.save()
-            document.chunks.set(chunks.filter(sequence__lt=chunk_beg) | chunks.filter(sequence__gt=chunk_end))
-            document.changed = True
-            document.save()
-        return HttpResponseRedirect(reverse_lazy('annotation', kwargs={'doc_id': doc_id}))
-    else:
-        form = DocSplitForm(chunks=chunks)
-    return render(request, 'storage/edit.html', {'form': form,
-                                                 'title': 'Podział dokumentu',
-                                                 'submit_btn_text': 'Podziel'})
+            self.object.chunks.set(chunks.filter(sequence__lt=chunk_beg) | chunks.filter(sequence__gt=chunk_end))
+            self.object.changed = True
+            self.object.save()
+            return HttpResponseRedirect(self.get_success_url())
+        return render(self.request, self.template_name, {'form': form})
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['title'] = 'Podział dokumentu'
+        context['submit_btn_text'] = 'Podziel'
+        return context
+
+    def get_form_kwargs(self):
+        kwargs = super(DocSplitView, self).get_form_kwargs()
+        kwargs['chunks'] = self.object.chunks.all().order_by('sequence')
+        return kwargs
+
+    def get_success_url(self):
+        return reverse_lazy('annotation', kwargs={'doc_id': self.object.id})
  
  
 def move_subdoc(request, subdoc_id, direction):