Merge pull request #78 from lexintegritastech/improve-main-ui

Fix bugs from `annotations` CRUD

app/components/annotation_marks_modal_form_component/annotation_marks_modal_form_component.html.erb

@@ -1,7 +1,4 @@
-<div class="modal fade modal-doctrine-body <%= opts[:is_show].present? ? 'show' : '' %>" 
-     id="annotationModal" tabindex="-1" aria-labelledby="annotationModal" aria-hidden="true"
-     style="<%= opts[:is_show].present? ? 'display: block;' : '' %>" aria-modal="<%= opts[:is_show].present? %>"
-     data-controller="annotations">
+<div class="modal fade modal-doctrine-body"  id="annotationModal" tabindex="-1" aria-labelledby="annotationModal" data-controller="annotations">
   <div class="modal-dialog modal-lg modal-dialog-scrollable">
     <div class="modal-content">
       <div class="modal-header">

app/controllers/doctrine/annotations_controller.rb

@@ -21,10 +21,10 @@ class Doctrine::AnnotationsController < ApplicationController
       if @annotation.save
         @documents.each { |document| @annotation.add_document(document) } if @documents.present?
 
-        format.html { redirect_to document_doctrine_path(@doctrine.document, @doctrine), 
+        format.html { redirect_to document_doctrine_path(@doctrine.doctrine_jurisprudences.first.jurisprudence, @doctrine), 
                       notice: "Doctrine Annotation was successfully created." }
       else
-        format.html { redirect_to document_doctrine_path(@doctrine.document, @doctrine) }
+        format.html { redirect_to document_doctrine_path(@doctrine.doctrine_jurisprudences.first.jurisprudence, @doctrine) }
       end
     end
   end
@@ -48,22 +48,21 @@ class Doctrine::AnnotationsController < ApplicationController
 
         @documents.each { |document| @annotation.add_document(document) } if @documents.present?
 
-        format.html { redirect_to document_doctrine_path(@doctrine.document, @doctrine), 
+        format.html { redirect_to document_doctrine_path(@doctrine.doctrine_jurisprudences.first.jurisprudence, @doctrine), 
                       notice: "Doctrine Annotation was successfully updated." }
       else
-        format.html { redirect_to document_doctrine_path(@doctrine.document, @doctrine) }
+        format.html { redirect_to document_doctrine_path(@doctrine.doctrine_jurisprudences.first.jurisprudence, @doctrine) }
       end
     end
   end
 
   def destroy
-    document_id = @doctrine.document_id
     respond_to do |format|
       if @annotation.destroy
-        format.html { redirect_to document_doctrine_path(@doctrine.document, @doctrine), 
+        format.html { redirect_to document_doctrine_path(@doctrine.doctrine_jurisprudences.first.jurisprudence, @doctrine), 
                       notice: "Doctrine Annotation was successfully destroyed." }
       else
-        format.html { redirect_to document_doctrine_path(@doctrine.document, @doctrine), 
+        format.html { redirect_to document_doctrine_path(@doctrine.doctrine_jurisprudences.first.jurisprudence, @doctrine), 
                       alert: @annotation.errors.full_messages }
       end
     end