Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 54316200C2F for ; Mon, 6 Mar 2017 07:50:51 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 52BF8160B76; Mon, 6 Mar 2017 06:50:51 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9B60C160B73 for ; Mon, 6 Mar 2017 07:50:50 +0100 (CET) Received: (qmail 87661 invoked by uid 500); 6 Mar 2017 06:50:49 -0000 Mailing-List: contact commits-help@atlas.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@atlas.incubator.apache.org Delivered-To: mailing list commits@atlas.incubator.apache.org Received: (qmail 87652 invoked by uid 99); 6 Mar 2017 06:50:49 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Mar 2017 06:50:49 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 3402918055C for ; Mon, 6 Mar 2017 06:50:49 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.567 X-Spam-Level: X-Spam-Status: No, score=-6.567 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999, SPF_NEUTRAL=0.652] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id Mj6X9oYzyPdD for ; Mon, 6 Mar 2017 06:50:48 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 6C2715FB62 for ; Mon, 6 Mar 2017 06:50:47 +0000 (UTC) Received: (qmail 87634 invoked by uid 99); 6 Mar 2017 06:50:46 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Mar 2017 06:50:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7A1FCE008F; Mon, 6 Mar 2017 06:50:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: madhan@apache.org To: commits@atlas.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-atlas git commit: ATLAS-1638: fix - ui sends same GUID while assigning a tag to multiple entities Date: Mon, 6 Mar 2017 06:50:46 +0000 (UTC) archived-at: Mon, 06 Mar 2017 06:50:51 -0000 Repository: incubator-atlas Updated Branches: refs/heads/master 40e2e37d4 -> e54fe04d7 ATLAS-1638: fix - ui sends same GUID while assigning a tag to multiple entities Signed-off-by: Madhan Neethiraj Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/e54fe04d Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/e54fe04d Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/e54fe04d Branch: refs/heads/master Commit: e54fe04d7a87d7d3ebaf780dd0f7b388e030d91a Parents: 40e2e37 Author: kevalbhatt Authored: Mon Mar 6 11:11:48 2017 +0530 Committer: Madhan Neethiraj Committed: Sun Mar 5 22:36:26 2017 -0800 ---------------------------------------------------------------------- dashboardv2/public/js/views/search/SearchResultLayoutView.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/e54fe04d/dashboardv2/public/js/views/search/SearchResultLayoutView.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/views/search/SearchResultLayoutView.js b/dashboardv2/public/js/views/search/SearchResultLayoutView.js index 0cee90f..27f692b 100644 --- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js +++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js @@ -165,7 +165,7 @@ define(['require', this.searchCollection.find(function(item) { if (item.get('isEnable')) { var term = []; - var obj = model.toJSON(); + var obj = item.toJSON(); that.arr.push({ id: obj.guid, model: obj @@ -481,13 +481,13 @@ define(['require', getTagList: function(guid, multiple) { var that = this; if (!multiple || multiple.length === 0) { - var modal = this.searchCollection.find(function(item) { - var obj = model.toJSON(); + var model = this.searchCollection.find(function(item) { + var obj = item.toJSON(); if (obj.guid === guid) { return true; } }); - if (modal) { + if (model) { var obj = model.toJSON(); } else { return [];