Repository: incubator-atlas Updated Branches: refs/heads/master 0901714a6 -> a1d54d656
ATLAS-870 Add search feature while associating Tags / Terms with entity. (Kalyanikashikar via yhemanth) Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/a1d54d65 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/a1d54d65 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/a1d54d65 Branch: refs/heads/master Commit: a1d54d6560c0fc79276ae9739f8ce5e699e46412 Parents: 0901714 Author: Hemanth Yamijala <[email protected]> Authored: Wed Jun 8 14:54:24 2016 +0530 Committer: Hemanth Yamijala <[email protected]> Committed: Wed Jun 8 14:54:24 2016 +0530 ---------------------------------------------------------------------- .../business_catalog/AddTermToEntityLayoutView.js | 13 +++++++++---- dashboardv2/public/js/views/tag/addTagModalView.js | 4 ++++ release-log.txt | 1 + 3 files changed, 14 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a1d54d65/dashboardv2/public/js/views/business_catalog/AddTermToEntityLayoutView.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/views/business_catalog/AddTermToEntityLayoutView.js b/dashboardv2/public/js/views/business_catalog/AddTermToEntityLayoutView.js index 6024f90..a5356f2 100644 --- a/dashboardv2/public/js/views/business_catalog/AddTermToEntityLayoutView.js +++ b/dashboardv2/public/js/views/business_catalog/AddTermToEntityLayoutView.js @@ -21,8 +21,9 @@ define(['require', 'hbs!tmpl/business_catalog/AddTermToEntityLayoutView_tmpl', 'utils/Utils', 'modules/Modal', - 'collection/VCatalogList' -], function(require, Backbone, AddTermToEntityLayoutViewTmpl, Utils, Modal, VCatalogList) { + 'collection/VCatalogList', + 'utils/Messages' +], function(require, Backbone, AddTermToEntityLayoutViewTmpl, Utils, Modal, VCatalogList, Messages) { 'use strict'; var AddTermToEntityLayoutView = Backbone.Marionette.LayoutView.extend( @@ -101,6 +102,10 @@ define(['require', terms += '<option value="' + obj.get('name') + '">' + obj.get('name') + '</option>'; }); this.ui.addTermOptions.html(terms); + this.ui.addTermOptions.select2({ + placeholder: "Select Term", + allowClear: true + }); }, saveTermToAsset: function() { var that = this; @@ -112,7 +117,7 @@ define(['require', beforeSend: function() {}, success: function(data) { Utils.notifySuccess({ - content: "Term " + that.ui.addTermOptions.val() + " has been added to entity" + content: "Term " + that.ui.addTermOptions.val() + Messages.addTermToEntitySuccessMessage }); if (that.callback) { that.callback(); @@ -125,7 +130,7 @@ define(['require', if (data && data.responseText) { var data = JSON.parse(data.responseText); Utils.notifyError({ - content: data.message + content: data.messages }); } }, http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a1d54d65/dashboardv2/public/js/views/tag/addTagModalView.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/views/tag/addTagModalView.js b/dashboardv2/public/js/views/tag/addTagModalView.js index 02f0be9..58f4918 100644 --- a/dashboardv2/public/js/views/tag/addTagModalView.js +++ b/dashboardv2/public/js/views/tag/addTagModalView.js @@ -87,6 +87,10 @@ define(['require', } }); this.ui.addTagOptions.html(str); + this.ui.addTagOptions.select2({ + placeholder: "Select Tag", + allowClear: true + }); }, onChangeTagDefination: function() { this.ui.tagAttribute.empty(); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a1d54d65/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index ff1890c..fb273bf 100644 --- a/release-log.txt +++ b/release-log.txt @@ -22,6 +22,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags) ALL CHANGES: +ATLAS-870 Add search feature while associating Tags / Terms with entity. (Kalyanikashikar via yhemanth) ATLAS-865 Edit description functionality for Tags (kevalbhatt18 via yhemanth) ATLAS-820 Kerberized env: Authentication failing (nixonrodrigues via yhemanth) ATLAS-852 Change Default landing page to taxonomy (kevalbhatt18 via yhemanth)
