From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id A3388E00A70; Wed, 14 Oct 2015 04:13:17 -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=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high * trust * [134.134.136.24 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id E3825E007FE for ; Wed, 14 Oct 2015 04:13:16 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 14 Oct 2015 04:12:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,681,1437462000"; d="scan'208";a="826402397" Received: from linux.intel.com ([10.23.219.25]) by orsmga002.jf.intel.com with ESMTP; 14 Oct 2015 04:12:54 -0700 Received: from linux.intel.com (vmed.fi.intel.com [10.237.72.51]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by linux.intel.com (Postfix) with ESMTP id 727F46A4005; Wed, 14 Oct 2015 04:11:55 -0700 (PDT) Date: Wed, 14 Oct 2015 14:12:49 +0300 From: Ed Bartosh To: Michael Wood Message-ID: <20151014111249.GA9973@linux.intel.com> References: <1443463980-9832-1-git-send-email-michael.g.wood@intel.com> <561E2E41.5000301@intel.com> MIME-Version: 1.0 In-Reply-To: <561E2E41.5000301@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: Mutt/1.5.21 (2010-09-15) Cc: "toaster@yoctoproject.org" 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 Reply-To: ed.bartosh@linux.intel.com 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 11:13:17 -0000 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit upstreamed and pushed to toaster-next On Wed, Oct 14, 2015 at 11:28:17AM +0100, Michael Wood wrote: > 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 > > -- > _______________________________________________ > toaster mailing list > toaster@yoctoproject.org > https://lists.yoctoproject.org/listinfo/toaster -- -- Regards, Ed