From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 14DE4E00A70; Wed, 14 Oct 2015 03:28:22 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low * trust * [209.85.212.178 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 81A7FE007FE for ; Wed, 14 Oct 2015 03:28:19 -0700 (PDT) Received: by wieq12 with SMTP id q12so75604773wie.1 for ; Wed, 14 Oct 2015 03:28:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-type :content-transfer-encoding; bh=Y5Jn1l/MV+BwgRWI4RWHCNxE2eoBrtn1NIZQJGWKwJE=; b=WrnjLG8hxqnAyqd9uLTAyZTpa3LyhbEMEhwsI9NGmHph6hMegtMYwyDdQvy+RSsYOz e1EkDDJsrML2AZedf0Ky20DWrFt74gnxThgnWP/AIBPCdlitheV3O6KapbWprJJRUixj Pr8Q4apm4BPXg70em3ZUkabOadDokjENBtdQtm944LKudN1p+cQaCbg5uHSay0Yjhf7i pS8zaja5R6zGozPZE5OfEe2hmI19NqIbgD9j/6kJ1Pe9FlpPr465MlcT1SU9UqJX4ffl 0wkILEzVKf+SCFusz57Fq+XzRqDAotzOrr/Mr0s2RCe3PgN26VHhaOp0gZ1dyP22aHTY Po3g== X-Gm-Message-State: ALoCoQm822mH5oSZ4haPMx0jSeUK/hARKzO6oOCpQJ845qs4cgDjANj9nUQMelniV2LrGgNSVxXd X-Received: by 10.180.8.68 with SMTP id p4mr27423267wia.16.1444818499086; Wed, 14 Oct 2015 03:28:19 -0700 (PDT) Received: from [192.168.2.10] ([83.217.123.106]) by smtp.googlemail.com with ESMTPSA id r9sm9093888wjz.35.2015.10.14.03.28.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Oct 2015 03:28:18 -0700 (PDT) To: "Barros Pena, Belen" , "toaster@yoctoproject.org" References: <1443463980-9832-1-git-send-email-michael.g.wood@intel.com> From: Michael Wood Message-ID: <561E2E41.5000301@intel.com> Date: Wed, 14 Oct 2015 11:28:17 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: Subject: Re: [PATCH] toaster: importlayer Update property names for importlayer api calls X-BeenThere: toaster@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Web based interface for BitBake List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Oct 2015 10:28:22 -0000 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit Ping on submission/review of this patch. On 29/09/15 11:28, Barros Pena, Belen wrote: > > On 29/09/2015 10:56, "Barros Pena, Belen" > wrote: > >> >> On 28/09/2015 19:13, "toaster-bounces@yoctoproject.org on behalf of >> Michael Wood" > michael.g.wood@intel.com> wrote: >> >>> Update the property names used in checking for existing layers. The >>> server side API changed but not all references were updated. >>> >>> [YOCTO #8300] >> If I try to import a layer with the same name as a layer listed in the all >> layers table for the project, I get the correct behaviour: the import >> layer form disappears and I get the notification telling me that a layer >> with that name already exists. >> >> However, if I try to import a layer with a name I know exists in the >> database, but the layer is not listed in the all layers table for the >> project, and I provide a different Git URL to the one in the database for >> the layer with that name, I am allowed to continue filling the form, but >> when I click the import layer button nothing happens. The browser console >> shows: >> >> importlayer.js:151 hint-layer-exists-with-different-url > My bad: it turns out we have a separate issue open for this > > https://bugzilla.yoctoproject.org/show_bug.cgi?id=8051 > > Cheers, > > Belén > >> To reproduce, create a project with the local release, go to the import >> layer page, type meta-oe as the layer name, then some gibberish as the git >> url. >> >> Ideally, if no layer with the name I've typed exists in the project, I >> should be allowed to import it. If the name and the git url match the >> entry in the database, maybe we create a new layer version. If the git url >> is different, we create a different layer entry. If this is too >> complicated, we can come up with a message explaining the issue and handle >> the problem in the same way we handle the layer name. >> >> Cheers >> >> Belén >> >>> Signed-off-by: Michael Wood >>> --- >>> bitbake/lib/toaster/toastergui/static/js/importlayer.js | 13 >>> ++++++------- >>> 1 file changed, 6 insertions(+), 7 deletions(-) >>> >>> diff --git a/bitbake/lib/toaster/toastergui/static/js/importlayer.js >>> b/bitbake/lib/toaster/toastergui/static/js/importlayer.js >>> index 2fadbc0..c68f366 100644 >>> --- a/bitbake/lib/toaster/toastergui/static/js/importlayer.js >>> +++ b/bitbake/lib/toaster/toastergui/static/js/importlayer.js >>> @@ -195,8 +195,8 @@ function importLayerPageInit (ctx) { >>> var dupLayerInfo = $("#duplicate-layer-info"); >>> dupLayerInfo.find(".dup-layer-name").text(layer.name); >>> dupLayerInfo.find(".dup-layer-link").attr("href", >>> layer.layerdetailurl); >>> - dupLayerInfo.find("#dup-layer-vcs-url").text(layer.layer__vcs_url); >>> - >>> dupLayerInfo.find("#dup-layer-revision").text(layer.revision.commit); >>> + dupLayerInfo.find("#dup-layer-vcs-url").text(layer.vcs_url); >>> + dupLayerInfo.find("#dup-layer-revision").text(layer.vcs_reference); >>> >>> $(".fields-apart-from-layer-name").fadeOut(function(){ >>> >>> @@ -214,11 +214,10 @@ function importLayerPageInit (ctx) { >>> $.getJSON(libtoaster.ctx.layersTypeAheadUrl, >>> { include_added: "true" , search: name, format: "json" }, >>> function(layer) { >>> - if (layer.rows.length > 0) { >>> - for (var i in layer.rows){ >>> - if (layer.rows[i].name == name) { >>> - console.log(layer.rows[i]) >>> - layerExistsError(layer.rows[i]); >>> + if (layer.results.length > 0) { >>> + for (var i in layer.results){ >>> + if (layer.results[i].name == name) { >>> + layerExistsError(layer.results[i]); >>> } >>> } >>> } >>> -- >>> 2.1.4 >>> >>> -- >>> _______________________________________________ >>> toaster mailing list >>> toaster@yoctoproject.org >>> https://lists.yoctoproject.org/listinfo/toaster