X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=projecthandler%2Ftemplate%2Fproject%2Fosm%2Fosm_project_descriptors.html;h=0957ba2f7e892c0d35207297c11c1bf771e42f7a;hb=e428af7f429a3e42379c42c633ded0651ea2f0cf;hp=182c8cc56f11986d626f7fd555aab80700cd9b0c;hpb=4908f382154fddb84d72ce8d516229649c01b606;p=osm%2FLW-UI.git

diff --git a/projecthandler/template/project/osm/osm_project_descriptors.html b/projecthandler/template/project/osm/osm_project_descriptors.html
index 182c8cc..0957ba2 100644
--- 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,16 +78,14 @@
                     }
                 },
                 "error": function (hxr, error, thrown) {
-                    console.log(hxr)
-                    console.log(thrown)
-                    console.log(error);
+
                 }
 
             },
             "columns": [
                 {
                     "render": function (data, type, row) {
-                       return row['short-name'];
+                       return row['short-name'] || '';
                     },
                     "targets": 0
                 },
@@ -120,17 +129,23 @@
                            '        data-toggle="tooltip" data-placement="top" title="Show content"\n' +
                            '        onclick="javascript:openPackageContentList(\''+ descriptor_type +'\', \''+row["_id"]+'\')">\n' +
                            '    <i class="fa fa-folder-open"></i></button>\n' +
-                           '<button type="button" class="btn btn-default" data-container="body"\n' +
+                            '<button type="button" class="btn btn-default" data-container="body"\n' +
+                           '        data-toggle="tooltip" data-placement="top" title="Clone"\n' +
+                           '        onclick="javascript:clonePackage(\''+ descriptor_type +'\', \''+row["_id"]+'\')">\n' +
+                           '    <i class="fa fa-clone"></i></button>\n';
+                        if(descriptor_type == "nsd")
+                           result += '<button type="button" class="btn btn-default" data-container="body"\n' +
                            '        data-toggle="tooltip" data-placement="top" title="Show Graph"\n' +
-                           '        onclick="location.href=\'/projects/graph?type='+descriptor_type+'&id='+row["_id"] +'\'"\n' +
-                           '        disabled><i class="fa fa-sitemap fa-fw"></i></button>\n' +
+                           '  onclick="location.href=\'/projects/descriptors/composer?type='+descriptor_type+'&id='+row["_id"] +'\'"\n' +
+                           '        ><i class="fa fa-sitemap fa-fw"></i></button>\n';
+                        result +=
                            '<button type="button" class="btn btn-default" data-container="body"\n' +
                            '        data-toggle="tooltip" data-placement="top" title="Download package"\n' +
                            '        onclick="location.href=\'/projects/descriptors/'+descriptor_type+'/'+ row["_id"] +'/action/download_pkg\'">\n' +
                            '    <i class="fa fa-download fa-fw"></i></button>\n' +
                            '<button type="button" class="btn btn-default" data-container="body"\n' +
                            '        data-toggle="tooltip" data-placement="top" title="Delete"\n' +
-                           '        onclick="javascript:deletePackage( \'' + descriptor_type + '\', \''+row["_id"] + '\')">\n' +
+                           '        onclick="javascript:deletePackage( \'' + descriptor_type + '\', \''+row["_id"] + '\', \''+row["name"] + '\')">\n' +
                            '    <i class="far fa-trash-alt"></i></button>\n' +
                            '</div>';
 
@@ -142,15 +157,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 %}