diff --git a/panel/templates/panel/project.html b/panel/templates/panel/project.html
index e761471..aaf15ef 100644
--- a/panel/templates/panel/project.html
+++ b/panel/templates/panel/project.html
@@ -17,12 +17,17 @@
{% block extrajs %}
{% endblock %}
diff --git a/panel/templates/panel/release.html b/panel/templates/panel/release.html
index 93ed7ea..8e967de 100644
--- a/panel/templates/panel/release.html
+++ b/panel/templates/panel/release.html
@@ -23,7 +23,9 @@ $( document ).ready(function() {
$.release.timer = setInterval(function(){
update_info('{{release}}');
}, $.release.interval);
- get_projects('{{release}}');
+{% for project in projects %}
+ create_new_project('{{ release }}', '{{ project.projectname }}');
+{% endfor %}
});
{% endblock %}
diff --git a/panel/views.py b/panel/views.py
index 0c66086..7066655 100644
--- a/panel/views.py
+++ b/panel/views.py
@@ -23,10 +23,14 @@ def index(request):
def release(request, release):
- context = {'release': release}
+ projects = jbi.objects.release_projects(release, flat=False)
+ context = {'release': release,
+ 'projects': projects}
return render(request, 'panel/release.html', context)
def project(request, release, project):
- context = {'project': project, 'release': release}
+ projects = [project, ]
+ uuids = jbi.objects.release_project_uuids_set(release, project)
+ context = {'project': project, 'release': release, 'uuids': uuids}
return render(request, 'panel/project.html', context)
diff --git a/repoapi/models.py b/repoapi/models.py
index b70e8ed..6c90b70 100644
--- a/repoapi/models.py
+++ b/repoapi/models.py
@@ -38,6 +38,11 @@ class JenkinsBuildInfoManager(models.Manager):
else:
return res.values('projectname')
+ def release_project_uuids_set(self, release, project):
+ res = self.get_queryset().filter(
+ param_release=release, projectname=project).distinct()
+ return res.order_by('projectname')
+
def release_project_uuids(self, release, project, flat=True):
res = self.get_queryset().filter(
param_release=release, projectname=project).distinct()