3 files changed, 32 insertions, 3 deletions
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index b9270d910..bce02f61d 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -141,7 +141,8 @@
                     {% trans "Time to take a coffee?" %} <i class="fa fa-coffee" aria-hidden="true"></i></span>
                 <span class='progress-detail progress-4'>
                     {% trans "Time to take another coffee?" %} <i class="fa fa-coffee" aria-hidden="true"></i></span>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"
+                    onclick="closed_wait = true;return true;">
                   <span aria-hidden="true">&times;</span>
                 </button>
             </div>
diff --git a/ishtar_common/templates/blocks/bs_form_snippet.html b/ishtar_common/templates/blocks/bs_form_snippet.html
index f122b33f2..0f5f9d83d 100644
--- a/ishtar_common/templates/blocks/bs_form_snippet.html
+++ b/ishtar_common/templates/blocks/bs_form_snippet.html
@@ -12,6 +12,7 @@
 </div>{% endif %}
 {% endfor %}
 
+{% csrf_token %}
 {% for field in form.visible_fields %}
 {% if form.SEARCH_AND_SELECT %}
 {{field}}
diff --git a/ishtar_common/templates/ishtar/qa_form.html b/ishtar_common/templates/ishtar/qa_form.html
index 2df3775ea..f3a4cf559 100644
--- a/ishtar_common/templates/ishtar/qa_form.html
+++ b/ishtar_common/templates/ishtar/qa_form.html
@@ -1,30 +1,57 @@
 {% load i18n inline_formset table_form %}
 
 <div class="modal-dialog modal-lg modal-dialog-centered">
-    <div class="modal-content" id='progress-content'>
+    <div class="modal-content">
         <div class="modal-header">
             <h2>{{page_name|safe}}</h2>
             <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                 <span aria-hidden="true">&times;</span>
             </button>
         </div>
-        <form enctype="multipart/form-data" action="." method="post">{% csrf_token %}
+        <form enctype="multipart/form-data" action="{{url}}" method="post"
+            id="qa-action">{% csrf_token %}
             <div class="modal-body body-scroll">
                 <div class='form'>
                     {% for error in form.non_field_errors %}
                     <p>{{ error }}</p>
                     {% endfor %}
                     {% bs_form form %}
+                    {% if confirm %}{% for field in form %}
+                    {% if field.value %}
+                    <label>{{field.label}}</label> {{ field.value }}
+                    {% endif %}
+                    {% endfor %}{% endif %}
                 </div>
             </div>
             <div class="modal-footer">
                 <button type="submit" id="submit_form" name='validate'
                         value="validate" class="btn btn-success">
+                    {% if confirm %}
+                    {% trans "Confirm" %}
+                    {% else %}
                     {% trans "Modify" %}
+                    {% endif %}
+                </button>
+                <button type="button" data-dismiss="modal"
+                        aria-label="Close" class="btn btn-secondary">
+                    {% trans "Cancel" %}
                 </button>
             </div>
         </form>
     </div>
 </div>
+<script type="text/javascript">
+    $('#qa-action').on('submit', function(event){
+        event.preventDefault();
+        $('#modal-dynamic-form').modal("hide");
+        short_wait();
+        ajax_post(
+            "{{url}}", $(this).serialize(), "#modal-dynamic-form",
+            function(){
+                $('#modal-dynamic-form').modal("show");
+            }
+        );
+    });
+</script>