Refactor move_chunk view for class-based view and modify MoveChunk form to fit

Marcel Kawski
1 parent fc722e51
Showing 3 changed files with 41 additions and 30 deletions
collector/storage/forms.py
collector/storage/urls.py
collector/storage/views.py
@@ -332,14 +332,13 @@ class DocSplitForm(Form):
         self.fields['chunk_end'].queryset = chunks
  
  
-class MoveChunkForm(Form):
-    target_doc = ModelChoiceField(queryset=None, label="Dokument docelowy")
+class MoveChunkForm(ModelForm):
  
     def __init__(self, *args, **kwargs):
         poss_target_docs = kwargs.pop('poss_target_docs')
         super(MoveChunkForm, self).__init__(*args, **kwargs)
-        self.fields['target_doc'].label_from_instance = self.label_from_instance
-        self.fields['target_doc'].queryset = poss_target_docs
+        self.fields['document'].label_from_instance = self.label_from_instance
+        self.fields['document'].queryset = poss_target_docs
  
     @staticmethod
     def label_from_instance(obj):
@@ -348,6 +347,13 @@ class MoveChunkForm(Form):
         else:
             return f'{obj} (dokument główny)'
  
+    class Meta:
+        model = Chunk
+        fields = ['document']
+        labels = {
+            'document': 'Dokument docelowy'
+        }
+
  
 class MergeChunkForm(Form):
     target_chunk = ModelChoiceField(queryset=None, label="Połącz z sekcją:")
@@ -17,7 +17,7 @@ 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.move_chunk), name='move_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('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'),
@@ -311,33 +311,38 @@ 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
+    template_name = 'storage/edit.html'
+    form_class = MoveChunkForm
  
-def move_chunk(request, pk):
-    chunk = Chunk.objects.get(pk=pk)
-    document = chunk.document
-    if document.parent is not None:  # subdocument
-        poss_target_docs = Document.objects.filter(parent=document.parent)
-        poss_target_docs = poss_target_docs.exclude(id=document.id)
-        poss_target_docs |= Document.objects.filter(pk=document.parent.pk)
-    else:  # main document
-        poss_target_docs = Document.objects.filter(parent=document)
-    if request.method == 'POST':
-        form = MoveChunkForm(request.POST, poss_target_docs=poss_target_docs)
-        if form.is_valid():
-            target_doc = form.cleaned_data['target_doc']
-            chunk.document = target_doc
-            chunk = handle_chunks_seq_uniqueness([chunk], target_doc.chunks.all())[0]
-            chunk.save()
-            document.changed = True
-            document.save()
-            return HttpResponseRedirect(reverse_lazy('annotation', kwargs={'doc_id': target_doc.id}))
-        return HttpResponseRedirect(reverse_lazy('annotation', kwargs={'doc_id': document.id}))
-    else:
-        form = MoveChunkForm(poss_target_docs=poss_target_docs)
-    return render(request, 'storage/edit.html', {'form': form,
-                                                 'title': 'Przenoszenie sekcji',
-                                                 'submit_btn_text': 'Przenieś'})
+    def form_valid(self, form):
+        if not self.request.is_ajax():
+            form.save(commit=True)
+            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'] = 'Przenoszenie sekcji'
+        context['submit_btn_text'] = 'Przenieś'
+        return context
+
+    def get_form_kwargs(self):
+        kwargs = super(MoveChunkView, 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)
+            poss_target_docs |= Document.objects.filter(pk=self.object.document.parent.pk)
+        else:  # main document
+            poss_target_docs = Document.objects.filter(parent=self.object.document)
+        kwargs['poss_target_docs'] = poss_target_docs
+        return kwargs
+
+    def get_success_url(self):
+        return '%s#chunk-%d' % (reverse_lazy('annotation', kwargs={'doc_id': self.object.document.id}), self.object.pk)
  
  
 def merge_chunk(request, pk, doc_id):