From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com [74.125.82.51]) by mail.openembedded.org (Postfix) with ESMTP id 858357564B for ; Mon, 29 Jun 2015 14:22:13 +0000 (UTC) Received: by wguu7 with SMTP id u7so142824196wgu.3 for ; Mon, 29 Jun 2015 07:22:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :subject:references:in-reply-to:content-type :content-transfer-encoding; bh=63rgtHatFFwRmxfUhZprrrJO/l1DiIKBi/QowiXMY0M=; b=Ly2CvKMzhs8uEtNn9Njri1qLSrjYQqFyA/yGcFRKbOB6IXYxP7STBbUiJrH33jCfPE YHaIVX/FvIKYbTFSM5RnhXgLF9luQfZ9AhOFlpWoZzW2szpVGcJvZpKaQuMwZ7EpdQmQ fx0B5+z7W/ihQP2lxkmEpDDKY/9yPQRwesq5q1edOX/IJg6kCbB+kx3RFl4D91auzBbj AZhxebqa13Vm2gqFBQ5voHtXgbddm4d+vYkbKEvga4VwGzo+w5cLwz9rb8csjfg7wPSi 3njYdlkzA1V2dzBTaGd05T7icwfJKMv/AjpHc46mYUJTRIeXe+b/Pm8x/+loe3o0LAzY hAcQ== X-Gm-Message-State: ALoCoQlw7jFZsZKzmvg03MD1q8jNzj/BAV6biIFWYQeC65J1M9lIm+CnvgfJf/XhfSw+q0C+5DFB X-Received: by 10.180.83.135 with SMTP id q7mr22717858wiy.17.1435587734142; Mon, 29 Jun 2015 07:22:14 -0700 (PDT) Received: from [192.168.2.170] ([83.217.123.106]) by mx.google.com with ESMTPSA id fa8sm12350801wib.14.2015.06.29.07.22.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jun 2015 07:22:13 -0700 (PDT) Message-ID: <55915494.9030206@intel.com> Date: Mon, 29 Jun 2015 15:22:12 +0100 From: Michael Wood User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: bitbake-devel@lists.openembedded.org References: <7aecb974d44d9bc711ffba5cc65e770811397fba.1435228176.git.alexandru.damian@intel.com> In-Reply-To: <7aecb974d44d9bc711ffba5cc65e770811397fba.1435228176.git.alexandru.damian@intel.com> Subject: Re: [PATCH 16/23] toasterui: fixes after html5 compliance testing X-BeenThere: bitbake-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussion that advance bitbake development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Jun 2015 14:22:16 -0000 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit On 25/06/15 11:33, Alex DAMIAN wrote: > From: Alexandru DAMIAN > > This patch brings fixes for issues highlighted by > HTML5 compliance testing. > > Signed-off-by: Alexandru DAMIAN > --- > lib/toaster/orm/models.py | 4 +++- > lib/toaster/toastergui/static/js/base.js | 2 +- > lib/toaster/toastergui/templates/configvars.html | 2 +- > .../toastergui/templates/detail_search_header.html | 2 +- > .../toastergui/templates/detail_sorted_header.html | 2 +- > .../toastergui/templates/generic-toastertable-page.html | 2 ++ > lib/toaster/toastergui/templates/importlayer.html | 15 +++++++++++++-- > lib/toaster/toastergui/templates/target.html | 2 +- > lib/toaster/toastergui/templates/toastertable-simple.html | 4 ++-- > lib/toaster/toastergui/templates/toastertable.html | 4 ++-- > lib/toaster/toastergui/views.py | 11 ++++++----- > 11 files changed, 33 insertions(+), 17 deletions(-) > > diff --git a/lib/toaster/orm/models.py b/lib/toaster/orm/models.py > index 8488aa4..7e8ab16 100644 > --- a/lib/toaster/orm/models.py > +++ b/lib/toaster/orm/models.py > @@ -180,7 +180,9 @@ class Project(models.Model): > if release == None: > release = self.release > # layers on the same branch or layers specifically set for this project > - queryset = Layer_Version.objects.filter((Q(up_branch__name = release.branch_name) & Q(project = None)) | Q(project = self) | Q(build__project = self)) > + queryset = Layer_Version.objects.filter(Q(project = self) | Q(build__project = self)) > + if release is not None: > + queryset = queryset.filter(Q(up_branch__name = release.branch_name) & Q(project = None)) > if layer_name is not None: > # we select only a layer name > queryset = queryset.filter(layer__name = layer_name) > diff --git a/lib/toaster/toastergui/static/js/base.js b/lib/toaster/toastergui/static/js/base.js > index d079f23..f1711c1 100644 > --- a/lib/toaster/toastergui/static/js/base.js > +++ b/lib/toaster/toastergui/static/js/base.js > @@ -39,7 +39,7 @@ function basePageInit(ctx) { > > libtoaster.getProjectInfo(selectedProject.projectPageUrl, > function (data) { > - if (data.machine.name === undefined || data.layers.length === 0) { > + if (data.machine === null || data.machine.name === undefined || data.layers.length === 0) { > /* we can't build anything with out a machine and some layers */ > $("#new-build-button #targets-form").hide(); > $("#new-build-button .alert").show(); > diff --git a/lib/toaster/toastergui/templates/configvars.html b/lib/toaster/toastergui/templates/configvars.html > index 8957673..8a572ae 100644 > --- a/lib/toaster/toastergui/templates/configvars.html > +++ b/lib/toaster/toastergui/templates/configvars.html > @@ -39,7 +39,7 @@ >
>
>
> - {% if request.GET.search %}{% endif %} > + {% if request.GET.search %}{% endif %} > > >
> diff --git a/lib/toaster/toastergui/templates/detail_search_header.html b/lib/toaster/toastergui/templates/detail_search_header.html > index ca8e158..7bea3f4 100644 > --- a/lib/toaster/toastergui/templates/detail_search_header.html > +++ b/lib/toaster/toastergui/templates/detail_search_header.html > @@ -28,7 +28,7 @@ $(document).ready(function() { >