new django app descriptionhandler

[osm/LW-UI.git] / projecthandler / template / project / osm / osm_project_descriptors.html

diff --git a/projecthandler/template/project/osm/osm_project_descriptors.html b/projecthandler/template/project/osm/osm_project_descriptors.html
index 4478ade..8c1ceb2 100644 (file)
--- a/projecthandler/template/project/osm/osm_project_descriptors.html
+++ b/projecthandler/template/project/osm/osm_project_descriptors.html
@@ -36,7 +36,7 @@
 {% include 'osm/modal/files_list.html' %}
 {% include 'modal/instance_create.html' %}
 <div class="row">
-    {% include "osm/descriptor/descriptorlist.html" %}
+    {% include "descriptorlist.html" %}
 </div>
 {% endblock %}
 
@@ -45,15 +45,26 @@
 
 {% block resource_block %}
        {{ block.super }}
+     <script src="/static/bower_components/select2/dist/js/select2.js"></script>
+    <script src="/static/src/instancehandler/instance_create.js"></script>
+    <script src="/static/src/projecthandler/descriptorslist.js"></script>
+    <script src="/static/src/projecthandler/onboard_package.js"></script>
+
     <script>
     var csrf_token = '{{csrf_token}}';
-    var descr_list_url = '{% url "projects:list_descriptors"   descriptor_type=descriptor_type%}';
+    var descr_list_url = '{% url "projects:descriptors:list_descriptors"   descriptor_type=descriptor_type%}';
     var vim_list_url = '{% url "vims:list"  %}';
-    var new_desc_url ="{% url 'projects:new_descriptor'  descriptor_type=descriptor_type %}";
-    var descriptor_type = '{{ descriptor_type }}';
+    var new_desc_url ="{% url 'projects:descriptors:new_descriptor'  descriptor_type=descriptor_type %}";
+    var descriptor_type = '{{ descriptor_type | safe }}';
     var project_id = '{{ project_id }}';
+    var table;
+
+    function refreshTable() {
+        table.ajax.reload();
+    }
+
     $(document).ready( function () {
-        var table = $('#descriptors_table').DataTable({
+        table = $('#descriptors_table').DataTable({
             responsive: true,
             "ajax": {
                 "url": "/projects/descriptors/" +descriptor_type+"/list",
@@ -67,9 +78,7 @@
                     }
                 },
                 "error": function (hxr, error, thrown) {
-                    console.log(hxr)
-                    console.log(thrown)
-                    console.log(error);
+
                 }
 
             },
@@ -146,15 +155,10 @@
 
         });
 
-        setInterval(function () {
-                table.ajax.reload();
-            }, 10000);
+        setInterval(refreshTable, 10000);
     });
     </script>
-    <script src="/static/bower_components/select2/dist/js/select2.js"></script>
-    <script src="/static/src/instancehandler/instance_create.js"></script>
-    <script src="/static/src/projecthandler/descriptorslist.js"></script>
-    <script src="/static/src/projecthandler/onboard_package.js"></script>
+
 
 {% endblock %}