admin section in left sidebar; project switch in navbar
Change-Id: I3a74e4aee11d479efa0b7fb41957a8e6e86fa1cd
Signed-off-by: lombardofr <lombardo@everyup.it>
diff --git a/projecthandler/template/project/osm/osm_project_details.html b/projecthandler/template/project/osm/osm_project_details.html
index 5158d8f..d5edc1e 100644
--- a/projecthandler/template/project/osm/osm_project_details.html
+++ b/projecthandler/template/project/osm/osm_project_details.html
@@ -1,4 +1,5 @@
{% extends "project_details.html" %}
+{% load date_tag %}
{% block head_base %}
{{ block.super }}
{% endblock %}
@@ -24,13 +25,12 @@
<li><a><b>Project Name:</b> <span
class="pull-right">{{project_overview.name}}</span></a>
</li>
- <li><a><b>Info:</b> <span
- class="pull-right">{{project_overview.info}}</span></a></li>
- <li><a><b>Last updated:</b> <span
- class="pull-right">{{project_overview.updated_date}}</span></a>
+ <li><a><b>Created:</b> <span
+ class="pull-right">{{project_overview.created_date|get_date}}</span></a></li>
+ <li><a><b>Modified:</b> <span
+ class="pull-right">{{project_overview.updated_date|get_date}}</span></a>
</li>
- <li><a><b>Owner:</b> <span
- class="pull-right">{{project_overview.owner}}</span></a></li>
+
</ul>
</div>
diff --git a/projecthandler/template/project/osm/osm_project_left_sidebar.html b/projecthandler/template/project/osm/osm_project_left_sidebar.html
index 82becc5..5bd34fd 100644
--- a/projecthandler/template/project/osm/osm_project_left_sidebar.html
+++ b/projecthandler/template/project/osm/osm_project_left_sidebar.html
@@ -78,7 +78,21 @@
<i class="fa fa-server fa-fw"></i> <span>VIM Accounts</span>
</a>
</li>
-
+ {% if user.is_admin %}
+ <li class="header">ADMIN</li>
+ {% url "users:list" as user_list_url %}
+ <li {% if request.get_full_path == user_list_url %} class="active" {% endif %}>
+ <a href='{% url "users:list" %}'>
+ <i class="fas fa-users"></i> <span>Users</span>
+ </a>
+ </li>
+ {% url "projects:projects_list" as proj_list_url %}
+ <li {% if request.get_full_path == proj_list_url %} class="active" {% endif %}>
+ <a href='{% url "projects:projects_list" %}'>
+ <i class="fas fa-folder"></i> <span>Projects</span>
+ </a>
+ </li>
+ {% endif %}
</ul>
</section>
<!-- /.sidebar -->
diff --git a/projecthandler/template/project/projectlist.html b/projecthandler/template/project/projectlist.html
index 6e3793d..85abb59 100644
--- a/projecthandler/template/project/projectlist.html
+++ b/projecthandler/template/project/projectlist.html
@@ -12,7 +12,7 @@
{% endblock %}
{% block left_sidebar %}
-{% include 'left_sidebar_base.html' %}
+{% include 'osm/osm_project_left_sidebar.html' %}
{% endblock %}
diff --git a/projecthandler/views.py b/projecthandler/views.py
index 575d253..0f0cf6c 100644
--- a/projecthandler/views.py
+++ b/projecthandler/views.py
@@ -255,6 +255,7 @@
client = Client()
##TODO change with adhoc api call
+ prj = client.project_get(user.get_token(), project_id)
nsd = client.nsd_list(user.get_token())
vnfd = client.vnfd_list(user.get_token())
ns = client.ns_list(user.get_token())
@@ -262,9 +263,9 @@
project_overview = {
'owner': user.username,
'name': project_id,
- 'updated_date': '-',
- 'created_date': '-',
- 'info': '-',
+ 'updated_date': prj['data']['_admin']['modified'] if prj and prj['error'] is False else '-',
+ 'created_date': prj['data']['_admin']['created'] if prj and prj['error'] is False else '-',
+
'type': 'osm',
'nsd': len(nsd['data']) if nsd and nsd['error'] is False else 0,
'vnfd': len(vnfd['data']) if vnfd and vnfd['error'] is False else 0,