X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=descriptorhandler%2Ftemplate%2Fdescriptor_view.html;h=0e1285dcd0483e2ac0da6c2248e753dda9cfe82a;hb=refs%2Fchanges%2F95%2F7895%2F1;hp=2a1866688dfcade66d047f87ec0a67f4ce70cdfc;hpb=0dc79eb941c0222f6d53d27fb2bca839bd60780d;p=osm%2FLW-UI.git

diff --git a/descriptorhandler/template/descriptor_view.html b/descriptorhandler/template/descriptor_view.html
index 2a18666..0e1285d 100644
--- a/descriptorhandler/template/descriptor_view.html
+++ b/descriptorhandler/template/descriptor_view.html
@@ -1,3 +1,19 @@
+<!--
+Copyright 2019 EveryUP srl
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an  BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
 {% extends "descriptor_view_base.html" %}
 
 {% load staticfiles %}
@@ -15,8 +31,12 @@ Edit {{ descriptor_type|upper }} Descriptor
 
 {% block breadcrumb_body %}
 {{ block.super }}
-<li><a href="{% url 'projects:open_project' %}">{{project_id}}</a></li>
-<li><a href="{% url 'projects:descriptors:list_descriptors' descriptor_type=descriptor_type %}">{{ descriptor_type }} Descriptors</a></li>
+{% if user.is_admin %}
+        <li><a href="{% url 'projects:projects_list' %}">Projects</a></li>
+{% else%}
+        <li><a href="#">Projects</a></li>
+{% endif %}
+<li><a href="{% url 'projects:open_project' %}">{{project_name}}</a></li>
 <li><a>{{descriptor_id}}</a></li>
 {% endblock %}
 
@@ -29,8 +49,8 @@ Edit {{ descriptor_type|upper }} Descriptor
 {% block nav_buttons_list %}
     {{ block.super }}
     <li class="pull-right"><button id="save" type="button" class="btn btn-block btn-primary btn-sm"  onclick="update(this.id)" ><i class="fa fa-save"></i> Update</button></li>
-    <li class="pull-right"><button id="save_show_graph" type="button" class="btn btn-block btn-primary btn-sm"  onclick="update(this.id)" disabled><i class="fa fa-save"></i> Update and Show Graph</button></li>
-    <li class="pull-right"><button type="button" class="btn btn-block btn-primary btn-sm"  onclick="goToGraph()" disabled><i class="fa fa-sitemap"></i> Show Graph</button></li>
+    <li class="pull-right"><button id="save_show_graph" type="button" class="btn btn-block btn-primary btn-sm"  onclick="update(this.id, 'true')"><i class="fa fa-save"></i> Update and Show Graph</button></li>
+    <li class="pull-right"><button type="button" class="btn btn-block btn-primary btn-sm"  onclick="goToGraph()"><i class="fa fa-sitemap"></i> Show Graph</button></li>
 
 {% endblock %}
 
@@ -79,7 +99,7 @@ Edit {{ descriptor_type|upper }} Descriptor
     });
 
 
-    function update(e) {
+    function update(e, show_graph) {
         var dialog = bootbox.dialog({
             message: '<div class="text-center"><i class="fa fa-spin fa-spinner"></i> Loading...</div>',
             closeButton: false
@@ -107,6 +127,9 @@ Edit {{ descriptor_type|upper }} Descriptor
                 'text': text
             },
             success: function (result) {
+                if(show_graph){
+                    goToGraph();
+                }
                 dialog.modal('hide');
                 $("#success-alert").fadeTo(2000, 500).slideDown(500, function(){
                     setTimeout(function () {
@@ -116,9 +139,14 @@ Edit {{ descriptor_type|upper }} Descriptor
                 });
             },
             error: function (result) {
-                console.log(result);
                 dialog.modal('hide');
-                bootbox.alert(result);
+                var data = result.responseJSON;
+                var title = "Error " + (data && data.code ? data.code : 'unknown');
+                var message = data && data.detail ? data.detail : 'No detail available.';
+                bootbox.alert({
+                    title: title,
+                    message: message
+                });
             }
         });
     }