X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=projecthandler%2Ftemplate%2Fproject%2Fprojectlist.html;h=9e259fe635dc5128590334fb5306c453ef92eb07;hb=5bc5ebbb3fe574a5699c580594808cee44a4e0b3;hp=a90fec83e162f1f3c7ea3e48691fbe41142fdf0f;hpb=4908f382154fddb84d72ce8d516229649c01b606;p=osm%2FLW-UI.git

diff --git a/projecthandler/template/project/projectlist.html b/projecthandler/template/project/projectlist.html
index a90fec8..9e259fe 100644
--- a/projecthandler/template/project/projectlist.html
+++ b/projecthandler/template/project/projectlist.html
@@ -5,7 +5,7 @@
 
 {% block head_block %}
   	{{ block.super }}
-    <link rel="stylesheet" href="/static/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css">
+    <link rel="stylesheet" href="/static/node_modules/datatables.net-bs/css/dataTables.bootstrap.min.css">
 
 {% endblock %}
 {% block title_header_big %}
@@ -20,7 +20,11 @@
 
 {% block breadcrumb_body %}
   	{{ block.super }}
-    <li><a href="{% url 'projects:projects_list' %}">Projects</a></li>
+      {% if user.is_admin %}
+      <li><a href="{% url 'projects:projects_list' %}">Projects</a></li>
+      {% else%}
+      <li><a href="#">Projects</a></li>
+      {% endif %}
 {% endblock %}
 
 {% block content_body %}
@@ -28,7 +32,6 @@
  {% csrf_token %}
 <div class="row">
 <div class="col-md-12">
-
     <div class="box">
         <div class="box-header with-border">
                   <h3 class="box-title">Projects</h3>
@@ -43,9 +46,7 @@
 			<table id="projects_table" class="table table-bordered table-striped">
 				<thead>
 					<tr>
-
 						<th>Name</th>
-
 						<th>Modification Date</th>
 						<th>Creation Date</th>
 						<th>Actions</th>
@@ -66,12 +67,13 @@
 
 {% block resource_block %}
   	{{ block.super }}
-    <script src="/static/bower_components/datatables.net/js/jquery.dataTables.min.js"></script>
-    <script src="/static/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+    <script src="/static/node_modules/datatables.net/js/jquery.dataTables.min.js"></script>
+    <script src="/static/node_modules/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
 
     <script>
-   $(document).ready( function () {
-        var table = $('#projects_table').DataTable({
+        var table;
+    $(document).ready( function () {
+        table = $('#projects_table').DataTable({
             responsive: true,
             "ajax": {
                 "url": "/projects/list",
@@ -94,7 +96,7 @@
             "columns": [
                 {
                     "render": function (data, type, row) {
-                       return '<a href="/projects/switch/'+row['name']+'" >'+row['name']+'</a>'
+                       return '<a href="/projects/'+row['name']+'/switch/" >'+row['name']+'</a>'
                     },
                     "targets": 0
                 },
@@ -127,7 +129,8 @@
                             ' </ul>\n' +
                             ' </div>';
                     },
-                    "targets": 3
+                    "targets": 3,
+                    "orderable": false
                 }
             ]
         });
@@ -150,72 +153,107 @@
 
     function deleteProject(project_id) {
         var url = "/projects/" + project_id+"/delete";
-    bootbox.confirm("Are you sure want to delete?", function (result) {
-        if (result) {
-            $.ajax({
-            url: url,
-            type: 'GET',
-            headers: {
-                "Accept": 'application/json'
-            },
-            contentType: false,
-            processData: false
-        }).done(function (response,textStatus, jqXHR) {
-
-            bootbox.alert({
-                title: "Result",
-                message: "Project deleted.",
-                callback: function () {
-                    location.reload();
-                }
-            });
-        }).fail(function(result){
-            var data  = result.responseJSON;
-            var title = "Error " + (data.code ? data.code: 'unknown');
-                var message = data.detail ? data.detail: 'No detail available.';
-                bootbox.alert({
-                    title: title,
-                    message: message
+        bootbox.confirm("Are you sure want to delete?", function (result) {
+            if (result) {
+                $.ajax({
+                    url: url,
+                    type: 'GET',
+                    headers: {
+                        "Accept": 'application/json'
+                    },
+                    contentType: false,
+                    processData: false
+                }).done(function (response,textStatus, jqXHR) {
+                    bootbox.alert({
+                        title: "Result",
+                        message: "Project deleted.",
+                        callback: function () {
+                            table.ajax.reload();
+                        }
+                    });
+                }).fail(function(result){
+                    var data  = result.responseJSON;
+                    var title = "Error " + (data.code ? data.code: 'unknown');
+                    var message = data.detail ? data.detail: 'No detail available.';
+                    bootbox.alert({
+                        title: title,
+                        message: message
+                    });
                 });
-        });
-        }
-    })
+            }
+        })
     }
 
     $(document).ready(function () {
-    $("#formNewProject").submit(function (event) {
-        event.preventDefault(); //prevent default action
-        var post_url = $(this).attr("action"); //get form action url
-        var request_method = $(this).attr("method"); //get form GET/POST method
-        var form_data = new FormData(this); //Encode form elements for submission
-        console.log(post_url);
-        $.ajax({
-            url: post_url,
-            type: request_method,
-            data: form_data,
-            headers: {
-                "Accept": 'application/json'
-            },
-            contentType: false,
-            processData: false
-        }).done(function (response,textStatus, jqXHR) {
-            bootbox.alert({
-                    title: "Result",
-                    message: "Project created.",
-                callback: function () {
-                    location.reload();
-                }
-                });
-        }).fail(function(result){
-            var data  = result.responseJSON;
-            var title = "Error " + (data.code ? data.code: 'unknown');
-                var message = data.detail ? data.detail: 'No detail available.';
+        $("#formNewProject").submit(function (event) {
+            event.preventDefault(); //prevent default action
+            var post_url = $(this).attr("action"); //get form action url
+            var request_method = $(this).attr("method"); //get form GET/POST method
+            var form_data = new FormData(this); //Encode form elements for submission
+            console.log(post_url);
+            $.ajax({
+                url: post_url,
+                type: request_method,
+                data: form_data,
+                headers: {
+                    "Accept": 'application/json'
+                },
+                contentType: false,
+                processData: false
+            }).done(function (response,textStatus, jqXHR) {
                 bootbox.alert({
-                    title: title,
-                    message: message
-                });
+                        title: "Result",
+                        message: "Project created.",
+                    callback: function () {
+                        table.ajax.reload();
+                        $('#modal_new_project').modal('hide');
+                    }
+                    });
+            }).fail(function(result){
+                var data  = result.responseJSON;
+                var title = "Error " + (data.code ? data.code: 'unknown');
+                    var message = data.detail ? data.detail: 'No detail available.';
+                    bootbox.alert({
+                        title: title,
+                        message: message
+                    });
+            });
+        });
+    
+        $("#formEditProject").submit(function(event){
+            event.preventDefault(); //prevent default action
+            var post_url = $(this).attr("action"); //get form action url
+            var request_method = $(this).attr("method"); //get form GET/POST method
+            var form_data = new FormData(this); //Encode form elements for submission
+            console.log(post_url);
+            $.ajax({
+                url: post_url,
+                type: request_method,
+                data: form_data,
+                headers: {
+                    "Accept": 'application/json'
+                },
+                contentType: false,
+                processData: false
+            }).done(function (response,textStatus, jqXHR) {
+                bootbox.alert({
+                        title: "Result",
+                        message: "Project updated.",
+                    callback: function () {
+                        table.ajax.reload();
+                        $('#modal_edit_project').modal('hide');
+                    }
+                    });
+            }).fail(function(result){
+                var data  = result.responseJSON;
+                var title = "Error " + (data.code ? data.code: 'unknown');
+                    var message = data.detail ? data.detail: 'No detail available.';
+                    bootbox.alert({
+                        title: title,
+                        message: message
+                    });
+            });
         });
-    });
     });