fix UUID problem with projects and roles; removed bower
Change-Id: Icd02c3e4a1ec080bdb00ebdffaf65d1eb2708fd5
Signed-off-by: lombardofr <lombardo@everyup.it>
diff --git a/packagehandler/template/package_list.html b/packagehandler/template/package_list.html
index 7ffd8d4..1130340 100644
--- a/packagehandler/template/package_list.html
+++ b/packagehandler/template/package_list.html
@@ -4,7 +4,7 @@
{% block head_block %}
{{ block.super }}
-<link rel="stylesheet" href="/static/bower_components/select2/dist/css/select2.min.css">
+<link rel="stylesheet" href="/static/node_modules/select2/dist/css/select2.min.css">
{% endblock %}
{% block title_header_big %}
@@ -22,7 +22,7 @@
{% block breadcrumb_body %}
{{ block.super }}
- <li><a href="{% url 'projects:open_project' %}">{{project_id}}</a></li>
+ <li><a href="{% url 'projects:open_project' %}">{{project_name}}</a></li>
<li><a> {% if package_type %}
{{ package_type }}
{% else%}
@@ -49,7 +49,7 @@
{% block resource_block %}
{{ block.super }}
- <script src="/static/bower_components/select2/dist/js/select2.js"></script>
+ <script src="/static/node_modules/select2/dist/js/select2.js"></script>
<script src="/static/src/instancehandler/instance_create.js"></script>
<script src="/static/src/packagehandler/packages_list.js"></script>
<script src="/static/src/drop_zone.js"></script>
diff --git a/packagehandler/urls.py b/packagehandler/urls.py
index 2a0c513..43366ce 100644
--- a/packagehandler/urls.py
+++ b/packagehandler/urls.py
@@ -16,7 +16,7 @@
from packagehandler import views
urlpatterns = [
- url(r'(?P<package_type>\w+)/list$', views.show_packages, name='list_packages'),
+ url(r'(?P<package_type>\w+)/list$', views.list_packages, name='list_packages'),
url(r'(?P<package_type>\w+)/create', views.create_package_empty, name='create_package_empty'),
url(r'(?P<package_type>\w+)/(?P<package_id>[-\w]+)/delete$', views.delete_package, name='delete_package'),
url(r'(?P<package_type>\w+)/(?P<package_id>[-\w]+)/clone', views.clone_package, name='clone_package'),
diff --git a/packagehandler/views.py b/packagehandler/views.py
index de90737..89d451d 100644
--- a/packagehandler/views.py
+++ b/packagehandler/views.py
@@ -32,9 +32,10 @@
@login_required
-def show_packages(request, package_type=None):
+def list_packages(request, package_type=None):
user = osmutils.get_user(request)
project_id = user.project_id
+ project_name = user.project_name
client = Client()
filter = request.GET.get('type')
try:
@@ -50,6 +51,7 @@
return __response_handler(request, {
'descriptors': descriptors['data'] if descriptors and descriptors['error'] is False else [],
'project_id': project_id,
+ 'project_name': project_name,
'project_type': 'osm',
'package_type': package_type
}, url)