Fix #507: Adding resources from multiple pages in the library now works

cadasta/templates/party/relationship_detail.html

@@ -1,11 +1,6 @@
 {% extends "spatial/location_wrapper.html" %}
 {% load i18n %}
 
-{% block form_script %}
-  {{ form.media }}
-  {% include "resources/scripts.html" %}
-{% endblock %}
-
 {% block location_panel %}
 
 <div class="col-md-4 detail">

cadasta/templates/party/relationship_resources_add.html

@@ -3,6 +3,10 @@
 
 {% block page_title %}Add new resource for relationship | {% endblock %}
 
+{% block location_extra_script %}
+  {% include 'resources/script_add_lib.html' %}
+{% endblock %}
+
 {% block modals %}
 {% url 'parties:relationship_detail' object.organization.slug object.slug relationship.id as cancel_url %}
 {% url 'parties:relationship_resource_new' object.organization.slug object.slug relationship.id as upload_url %}

cadasta/templates/party/relationship_resources_new.html

@@ -3,9 +3,9 @@
 
 {% block page_title %}Upload new resource for relationship | {% endblock %}
 
-{% block extra_script %}
+{% block location_extra_script %}
   {{ form.media }}
-  {% include "resources/scripts.html" %}
+  {% include "resources/script_upload.html" %}
 {% endblock %}
 
 {% block modals %}

cadasta/templates/party/resources_add.html

@@ -3,9 +3,12 @@
 
 {% block page_title %}Add new resource for party | {% endblock %}
 
+{% block extra_script %}
+  {% include 'resources/script_add_lib.html' %}
+{% endblock %}
+
 {% block modals %}
 {% url 'parties:detail' object.organization.slug object.slug party.id as cancel_url %}
 {% url 'parties:resource_new' object.organization.slug object.slug party.id as upload_url %}
 {% include 'resources/modal_add_lib.html' %}
 {% endblock %}
-

cadasta/templates/party/resources_new.html

@@ -5,7 +5,7 @@
 
 {% block extra_script %}
   {{ form.media }}
-  {% include "resources/scripts.html" %}
+  {% include "resources/script_upload.html" %}
 {% endblock %}
 
 {% block modals %}

cadasta/templates/resources/edit.html

@@ -6,7 +6,7 @@
 
 {% block extra_script %}
   {{ form.media }}
-  {% include "resources/scripts.html" %}
+  {% include "resources/script_upload.html" %}
 {% endblock %}
 
 {% block content %}

cadasta/templates/resources/project_add_existing.html

@@ -3,6 +3,10 @@
 
 {% block page_title %}Add new resource for project | {% endblock %}
 
+{% block extra_script %}
+  {% include 'resources/script_add_lib.html' %}
+{% endblock %}
+
 {% block modals %}
 {% url 'resources:project_list' object.organization.slug object.slug as cancel_url %}
 {% url 'resources:project_add_new' object.organization.slug object.slug as upload_url %}

cadasta/templates/resources/project_add_new.html

@@ -5,7 +5,7 @@
 
 {% block extra_script %}
   {{ form.media }}
-  {% include "resources/scripts.html" %}
+  {% include "resources/script_upload.html" %}
 {% endblock %}
 
 {% block modals %}

cadasta/templates/resources/script_add_lib.html

@@ -0,0 +1,17 @@
+  <script>
+    'use strict';
+    $(function() {
+      var form = $('.modal form');
+      form.submit(function() {
+        var cells = $('.modal .datatable').DataTable().column().nodes();
+        for (var i = 0; i < cells.length; i++) {
+          var checkbox = cells[i].childNodes[0];
+          if (checkbox.checked) {
+            checkbox.checked = false;
+            form.append('<input type="hidden" name="' + checkbox.name + '" value="on" />');
+          }
+        }
+        return true;
+      });
+    });
+  </script>

cadasta/templates/spatial/location_wrapper.html

@@ -62,7 +62,7 @@
       $('a[href=' + anchor + ']').tab('show');
   });
 </script>
-{% block form_script %}{% endblock %}
+{% block location_extra_script %}{% endblock %}
 {% endblock %}
 
 {% block content %}

cadasta/templates/spatial/relationship_add.html

@@ -4,7 +4,7 @@
 
 {% block page_title %}Add new relationship | {% endblock %}
 
-{% block form_script %}
+{% block location_extra_script %}
   {{ form.media }}
 {% endblock %}
 

cadasta/templates/spatial/resources_add.html

@@ -1,8 +1,12 @@
-{% extends "spatial/location_wrapper.html" %}
+{% extends "spatial/location_detail.html" %}
 {% load i18n %}
 
 {% block page_title %}Add new resource for location | {% endblock %}
 
+{% block location_extra_script %}
+  {% include 'resources/script_add_lib.html' %}
+{% endblock %}
+
 {% block modals %}
 {% url 'locations:detail' object.organization.slug object.slug location.id as cancel_url %}
 {% url 'locations:resource_new' object.organization.slug object.slug location.id as upload_url %}

cadasta/templates/spatial/resources_new.html

@@ -1,11 +1,11 @@
-{% extends "spatial/location_wrapper.html" %}
+{% extends "spatial/location_detail.html" %}
 {% load i18n %}
 
 {% block page_title %}Upload new resource for location | {% endblock %}
 
-{% block extra_script %}
+{% block location_extra_script %}
   {{ form.media }}
-  {% include "resources/scripts.html" %}
+  {% include "resources/script_upload.html" %}
 {% endblock %}
 
 {% block modals %}