From 932368e87dc331840126c84ba3ce84ab417b581c Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Tue, 25 Oct 2016 09:24:05 +0200 Subject: [PATCH] MT#7247 panel: fix latest view * reduce AJAX calls for removed uuids Change-Id: I055298b76e1064e6fdef572b5c877f21b442e6b1 --- panel/static/panel/js/panel.js | 13 ++++++++----- panel/templates/panel/project_uuid.html | 2 ++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/panel/static/panel/js/panel.js b/panel/static/panel/js/panel.js index 7495361..b1a8b38 100644 --- a/panel/static/panel/js/panel.js +++ b/panel/static/panel/js/panel.js @@ -259,11 +259,11 @@ function create_new_project_panel(project) { var latest_uuid_url; if ($.panel == 'project_uuid') { - latest_uuid_url = '../latest'; + latest_uuid_url = '../latest/'; } else if ($.panel == 'release') { - latest_uuid_url = project + '/latest'; + latest_uuid_url = project + '/latest/'; } else { - latest_uuid_url = 'latest'; + latest_uuid_url = 'latest/'; } $('.latest-uuid-url', div_project).attr('href', latest_uuid_url); $('.error', div_project).attr('id', project + '-error').removeClass('error'); @@ -384,12 +384,15 @@ function get_uuids_for_project(release, project) { function successFunc(data, textStatus, jqXHR ) { $(data).each(function() { + if($.release[project].removed_uuids.has(this.tag)){ + /* skip iteration */ + return true; + } if (this.latest && $.release[project].last_uuid != this.tag) { $.release[project].last_uuid = this.tag; console.debug(project + ".latest_uuid:" + $.release[project].last_uuid); } - if (!$.release[project].uuids.has(this.tag) && - !$.release[project].removed_uuids.has(this.tag)) + if (!$.release[project].uuids.has(this.tag)) { create_new_uuid(release, project, this); } diff --git a/panel/templates/panel/project_uuid.html b/panel/templates/panel/project_uuid.html index 64c8eef..4739ede 100644 --- a/panel/templates/panel/project_uuid.html +++ b/panel/templates/panel/project_uuid.html @@ -1,5 +1,6 @@ {% extends "panel/base.html" %} {% load jsonify %} +{% load staticfiles %} {% block title %}{{ project }}{% endblock %} {% block navlist %} @@ -17,6 +18,7 @@ {% endblock %} {% block extrajs %} +