update README.rst

Author: trco

README.rst

@@ -92,8 +92,6 @@ Define BookModelForm and inherit built-in form ``BSModalModelForm``.
 Define form's html and save it as Django template.
 
 - Bootstrap 4 modal elements are used in this example.
-- Button triggering the submission should have type attribute set to ``"button"`` and not ``"submit"``.
-- Add ``class="submit-btn"`` or custom ``submitBtn`` class (see paragraph **Options**) to this button.
 - Form will POST to ``formURL`` defined in #6.
 - Add ``class="invalid"`` or custom ``errorClass`` (see paragraph **Options**) to the elements that wrap the fields.
 - ``class="invalid"`` acts as a flag for the fields having errors after the form has been POSTed.
@@ -126,7 +124,7 @@ Define form's html and save it as Django template.
 
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-        <button type="button" class="submit-btn btn btn-primary">Create</button>
+        <button type="submit" class="btn btn-primary">Create</button>
       </div>
 
     </form>
@@ -332,12 +330,12 @@ modalForm
 formURL
   Sets the url of the form's view and html. ``Default: null``
 
+isDeleteForm
+  Defines if form is used for deletion. Should be set to ``true`` for deletion forms.  ``Default: false``
+
 errorClass
   Sets the custom class for the form fields having errors. ``Default: ".invalid"``
 
-submitBtn
-  Sets the custom class for the button triggering form submission in modal. ``Default: ".submit-btn"``
-
 asyncUpdate
   Sets asynchronous content update after form submission. ``Default: false``
 
@@ -351,7 +349,7 @@ asyncSettings.dataUrl
   Sets url of the view returning new queryset = all of the objects plus newly created or updated one after asynchronous update. ``Default: null``
 
 asyncSettings.dataElementId
-  Sets the ``id`` of the element which renders asynchronously updated queryset. ``Default: null``
+  Sets the ``id`` of the element which rerenders asynchronously updated queryset. ``Default: null``
 
 asyncSettings.dataKey
   Sets the key containing asynchronously updated queryset in the data dictionary returned from the view providing updated queryset. ``Default: null``
@@ -369,8 +367,8 @@ modalForm default settings object and it's structure
         modalContent: ".modal-content",
         modalForm: ".modal-content form",
         formURL: null,
+        isDeleteForm: false,
         errorClass: ".invalid",
-        submitBtn: ".submit-btn",
         asyncUpdate: false,
         asyncSettings: {
             closeOnSubmit: false,
@@ -509,7 +507,7 @@ For explanation how all the parts of the code work together see paragraph **Usag
       </div>
 
       <div class="modal-footer">
-        <button type="button" class="submit-btn btn btn-primary">Sign up</button>
+        <button type="submit" class="btn btn-primary">Sign up</button>
       </div>
 
     </form>
@@ -627,7 +625,7 @@ You can also set the custom login redirection by:
       </div>
 
       <div class="modal-footer">
-        <button type="button" class="submit-btn btn btn-primary">Log in</button>
+        <button type="submit" class="btn btn-primary">Log in</button>
       </div>
 
     </form>
@@ -735,7 +733,7 @@ For explanation how all the parts of the code work together see paragraph **Usag
       </div>
 
       <div class="modal-footer">
-        <button type="button" class="submit-btn btn btn-primary">Create</button>
+        <button type="submit" class="btn btn-primary">Create</button>
       </div>
 
     </form>
@@ -777,7 +775,7 @@ For explanation how all the parts of the code work together see paragraph **Usag
       </div>
 
       <div class="modal-footer">
-        <button type="button" class="submit-btn btn btn-primary">Update</button>
+        <button type="submit" class="btn btn-primary">Update</button>
       </div>
 
     </form>
@@ -940,15 +938,17 @@ For explanation how all the parts of the code work together see paragraph **Usag
     <script type="text/javascript">
       $(function () {
 
-        // Update, Read and Delete book buttons open modal with id="modal" (default)
-        // The formURL is retrieved from the data of the element
-        $(".bs-modal").each(function () {
-          $(this).modalForm({
-              formURL: $(this).data('form-url')
-          });
+        // Read book buttons
+        $(".read-book").each(function () {
+            $(this).modalForm({formURL: $(this).data("form-url")});
         });
 
-         // Create book button opens form in modal with id="create-modal"
+        // Delete book buttons - formURL is retrieved from the data of the element
+        $(".delete-book").each(function () {
+            $(this).modalForm({formURL: $(this).data("form-url"), isDeleteForm: true});
+        });
+
+        // Create book button opens form in modal with id="create-modal"
         $("#create-book").modalForm({
             formURL: "{% url 'create_book' %}",
             modalID: "#create-modal"
@@ -976,7 +976,7 @@ For explanation how all the parts of the code work together see paragraph **Usag
         type = forms.ChoiceField(choices=Book.BOOK_TYPES)
 
         class Meta:
-            fields = ['type', 'clear']
+            fields = ['type']
 
 .. code-block:: html
 
@@ -1015,8 +1015,7 @@ For explanation how all the parts of the code work together see paragraph **Usag
       </div>
 
       <div class="modal-footer">
-        <input type="submit" class="btn btn-primary" name="clear" value="Clear"/>
-        <button type="button" class="submit-btn btn btn-primary">Filter</button>
+        <button type="submit" class="btn btn-primary">Filter</button>
       </div>
 
     </form>
@@ -1030,11 +1029,7 @@ For explanation how all the parts of the code work together see paragraph **Usag
         form_class = BookFilterForm
 
         def form_valid(self, form):
-            if 'clear' in self.request.POST:
-                self.filter = ''
-            else:
-                self.filter = '?type=' + form.cleaned_data['type']
-
+            self.filter = '?type=' + form.cleaned_data['type']
             response = super().form_valid(form)
             return response
 
@@ -1058,15 +1053,15 @@ For explanation how all the parts of the code work together see paragraph **Usag
     index.html
 
       ...
-      <button id="filter-book" class="bs-modal btn btn-primary" type="button" name="button" data-form-url="{% url 'filter_book' %}">
+      <button id="filter-book" class="filter-book btn btn-primary" type="button" name="button" data-form-url="{% url 'filter_book' %}">
         <span class="fa fa-filter mr-2"></span>Filter books
       </button>
       ...
 
       <script type="text/javascript">
         $(function () {
           ...
-          $(".bs-modal").each(function () {
+          $("#filter-book").each(function () {
               $(this).modalForm({formURL: $(this).data('form-url')});
           });
           ...