Refactor merge_chunk view for class-based view and modify MergeChunkForm to fit

Marcel Kawski
1 parent 029655ae
Showing 3 changed files with 42 additions and 31 deletions
collector/storage/forms.py
collector/storage/urls.py
collector/storage/views.py
@@ -331,17 +331,16 @@ class DocSplitForm(ModelForm):
         self.fields['chunk_beg'].queryset = chunks
         self.fields['chunk_end'].queryset = chunks
  
-
     class Meta:
         model = Document
         fields = ['chunk_beg', 'chunk_end']
  
  
-class MoveChunkForm(ModelForm):
+class ChunkMoveForm(ModelForm):
  
     def __init__(self, *args, **kwargs):
         poss_target_docs = kwargs.pop('poss_target_docs')
-        super(MoveChunkForm, self).__init__(*args, **kwargs)
+        super(ChunkMoveForm, self).__init__(*args, **kwargs)
         self.fields['document'].label_from_instance = self.label_from_instance
         self.fields['document'].queryset = poss_target_docs
  
@@ -360,17 +359,20 @@ class MoveChunkForm(ModelForm):
         }
  
  
-class MergeChunkForm(Form):
+class ChunkMergeForm(ModelForm):
     target_chunk = ModelChoiceField(queryset=None, label="Połącz z sekcją:")
  
     def __init__(self, *args, **kwargs):
         poss_target_chunks = kwargs.pop('poss_target_chunks')
-        super(MergeChunkForm, self).__init__(*args, **kwargs)
+        super(ChunkMergeForm, self).__init__(*args, **kwargs)
         self.fields['target_chunk'].label_from_instance = self.label_from_instance
         self.fields['target_chunk'].queryset = poss_target_chunks
-        self.fields['target_chunk'].widget.attrs['required'] = 'required'
  
     @staticmethod
     def label_from_instance(obj):
         if obj:
             return obj.sequence
+
+    class Meta:
+        model = Chunk
+        fields = ['target_chunk']
@@ -17,8 +17,8 @@ urlpatterns = [
          name='add_chunk_between'),
     path('chunk/edit/<int:pk>', login_required(views.ChunkEditView.as_view()), name='edit_chunk'),
     path('chunk/delete/<int:pk>', login_required(views.ChunkDeleteView.as_view()), name='delete_chunk'),
-    path('chunk/move/<int:pk>', login_required(views.MoveChunkView.as_view()), name='move_chunk'),
-    path('chunk/merge/<int:pk>/<str:doc_id>', login_required(views.merge_chunk), name='merge_chunk'),
+    path('chunk/move/<int:pk>', login_required(views.ChunkMoveView.as_view()), name='move_chunk'),
+    path('chunk/merge/<int:pk>/<str:doc_id>', login_required(views.ChunkMergeView.as_view()), name='merge_chunk'),
     path('subchunk/add/<int:chunk_pk>', login_required(views.SubchunkAddView.as_view()), name='add_subchunk'),
     path('subchunk/edit/<int:pk>', login_required(views.SubchunkEditView.as_view()), name='edit_subchunk'),
     path('subchunk/delete/<int:pk>', login_required(views.SubchunkDeleteView.as_view()), name='delete_subchunk'),
@@ -19,7 +19,7 @@ from keras import backend
 from sys import maxsize
  
 from .forms import ChunkForm, ParticipantForm, SubchunkForm, MetadataForm, DocDetailsForm, KeywordForm, DocSplitForm, \
-    MoveChunkForm, SubDocDetailsForm, AuthorForm, MergeChunkForm
+    ChunkMoveForm, SubDocDetailsForm, AuthorForm, ChunkMergeForm
 from .models import Chunk, Document, Participant, Metadata, Keyword, Annotation
 from projects.ppc.models import Utterance
 from pipeline.models import ProcessingStatus
@@ -313,10 +313,10 @@ class ChunkAddBetweenView(CreateView):
                                 self.object.pk)
  
  
-class MoveChunkView(UpdateView):
+class ChunkMoveView(UpdateView):
     model = Chunk
     template_name = 'storage/edit.html'
-    form_class = MoveChunkForm
+    form_class = ChunkMoveForm
  
     def form_valid(self, form):
         if not self.request.is_ajax():
@@ -331,7 +331,7 @@ class MoveChunkView(UpdateView):
         return context
  
     def get_form_kwargs(self):
-        kwargs = super(MoveChunkView, self).get_form_kwargs()
+        kwargs = super(ChunkMoveView, self).get_form_kwargs()
         if self.object.document.parent is not None:  # subdocument
             poss_target_docs = Document.objects.filter(parent=self.object.document.parent)
             poss_target_docs = poss_target_docs.exclude(id=self.object.document.id)
@@ -345,27 +345,36 @@ class MoveChunkView(UpdateView):
         return '%s#chunk-%d' % (reverse_lazy('annotation', kwargs={'doc_id': self.object.document.id}), self.object.pk)
  
  
-def merge_chunk(request, pk, doc_id):
-    try:
-        chunk = Chunk.objects.get(pk=pk)
-        document = chunk.document
-        poss_target_chunks = document.chunks.all()
-        poss_target_chunks = poss_target_chunks.exclude(id=chunk.id)
-        form = MergeChunkForm(request.POST, poss_target_chunks=poss_target_chunks)
-    except Chunk.DoesNotExist:
-        form, chunk, poss_target_chunks, document = None, None, None, None
-    if request.method == 'POST':
-        if form is not None and form.is_valid():
+class ChunkMergeView(UpdateView):
+    model = Chunk
+    template_name = 'storage/edit.html'
+    form_class = ChunkMergeForm
+
+    def form_valid(self, form):
+        if not self.request.is_ajax():
             target_chunk = form.cleaned_data['target_chunk']
-            target_chunk.text += f' {chunk.text}'
+            target_chunk.text += f' {self.object.text}'
             target_chunk.save()
-            chunk.delete()
-        return HttpResponseRedirect(reverse_lazy('annotation', kwargs={'doc_id': doc_id}))
-    else:
-        form = MergeChunkForm(poss_target_chunks=poss_target_chunks)
-    return render(request, 'storage/edit.html', {'form': form,
-                                                 'title': 'Łączenie sekcji',
-                                                 'submit_btn_text': 'Połącz'})
+            self.object.delete()
+            return HttpResponseRedirect(self.get_success_url(target_chunk))
+        return render(self.request, self.template_name, {'form': form})
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['title'] = 'Łączenie sekcji'
+        context['submit_btn_text'] = 'Połącz'
+        return context
+
+    def get_form_kwargs(self):
+        kwargs = super(ChunkMergeView, self).get_form_kwargs()
+        poss_target_chunks = self.object.document.chunks.all()
+        poss_target_chunks = poss_target_chunks.exclude(id=self.object.id)
+        kwargs['poss_target_chunks'] = poss_target_chunks
+        return kwargs
+
+    def get_success_url(self, target_chunk):
+        return '%s#chunk-%d' % (reverse_lazy('annotation', kwargs={'doc_id': target_chunk.document.id}),
+                                target_chunk.pk)
  
  
 class SubchunkAddView(CreateView):