Skip to content

A
atlas
Commit 3b75d56d by kevalbhatt Committed by Madhan Neethiraj
Options

ATLAS-2678: UI - term-to-term association attribute values are not saved

Signed-off-by: 's avatarMadhan Neethiraj <madhan@apache.org>
parent cbca591d
Showing with 69 additions and 55 deletions
dashboardv2/public/js/templates/glossary/AssignTermLayoutView_tmpl.html
......@@ -27,7 +27,7 @@
<div class="form-group">
<label class="control-label col-sm-2" for="name">{{@key}}</label>
<div class="col-sm-10">
<input class="form-control" name="{{@key}}" value="" data-id="displayName" placeholder="{{@key}}" />
<input class="form-control" name="{{@key}}" data-id="displayName" placeholder="{{@key}}" />
</div>
</div>
{{/each}}
......
dashboardv2/public/js/utils/CommonViewFunction.js
......@@ -622,9 +622,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
}
});
modal.on('ok', function() {
if (isGlossaryView) {
modal.$el.find('button.ok').attr("disabled", true);
}
modal.$el.find('button.ok').attr("disabled", true);
CommonViewFunction.createEditGlossaryCategoryTermSubmit(_.extend({ "ref": view, "modal": modal }, options));
});
modal.on('closeModal', function() {
......@@ -669,9 +667,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
modal.trigger('closeModal');
},
cust_error: function() {
if (isGlossaryView) {
modal.$el.find('button.ok').attr("disabled", false);
}
modal.$el.find('button.ok').attr("disabled", false);
}
}
if (model) {
......
dashboardv2/public/js/views/glossary/AssignTermLayoutView.js
......@@ -47,7 +47,6 @@ define(['require',
/** ui selector cache */
ui: {
termAttributeForm: '[data-id="termAttributeForm"]',
wizard: '[data-id="wizard"]'
},
/** ui events hash */
......@@ -178,7 +177,7 @@ define(['require',
}
model.assignCategoryToTerm(_.extend(ajaxOptions, { data: JSON.stringify(data), guid: data.guid }));
} else if (this.isAttributeRelationView) {
termAttributeFormData = this.ui.termAttributeForm.serializeArray().reduce(function(obj, item) {
termAttributeFormData = this.$('[data-id="termAttributeForm"]').serializeArray().reduce(function(obj, item) {
obj[item.name] = item.value;
return obj;
}, {}),
......
dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
......@@ -78,12 +78,13 @@ define(['require',
this.onClickRemoveAssociationBtn(e);
} else {
var guid = $(e.currentTarget).data('guid'),
gId = this.data.anchor && this.data.anchor.glossaryGuid,
categoryObj = _.find(this.data.categories, { "categoryGuid": guid });
this.glossary.selectedItem = { "type": "GlossaryCategory", "guid": guid, "model": categoryObj };
Utils.setUrl({
url: '#!/glossary/' + guid,
mergeBrowserUrl: false,
urlParams: { gType: "category", viewType: "category", fromView: "glossary" },
urlParams: { gType: "category", viewType: "category", fromView: "glossary", gId: gId },
trigger: true,
updateTabState: true
});
......@@ -94,12 +95,13 @@ define(['require',
this.onClickRemoveAssociationBtn(e);
} else {
var guid = $(e.currentTarget).data('guid'),
gId = this.data.anchor && this.data.anchor.glossaryGuid,
termObj = _.find(this.data.terms, { "termGuid": guid });
this.glossary.selectedItem = { "type": "GlossaryTerm", "guid": guid, "model": termObj };
Utils.setUrl({
url: '#!/glossary/' + guid,
mergeBrowserUrl: false,
urlParams: { gType: "term", viewType: "term", fromView: "glossary" },
urlParams: { gType: "term", viewType: "term", fromView: "glossary", gId: gId },
trigger: true,
updateTabState: true
});
......@@ -427,15 +429,18 @@ define(['require',
renderTagTableLayoutView: function(options) {
var that = this;
require(['views/tag/TagDetailTableLayoutView'], function(TagDetailTableLayoutView) {
that.RTagTableLayoutView.show(new TagDetailTableLayoutView(_.extend({}, options, {
"entityName": that.ui.title.text(),
"fetchCollection": that.getData.bind(that),
"entity": that.data
})));
if (that.RTagTableLayoutView) {
that.RTagTableLayoutView.show(new TagDetailTableLayoutView(_.extend({}, options, {
"entityName": that.ui.title.text(),
"fetchCollection": that.getData.bind(that),
"entity": that.data
})));
}
});
},
renderSearchResultLayoutView: function(options) {
var that = this;
require(['views/search/SearchResultLayoutView'], function(SearchResultLayoutView) {
var value = {
'tag': "PII",
......@@ -452,11 +457,13 @@ define(['require',
renderRelationLayoutView: function(options) {
var that = this;
require(['views/glossary/TermRelationAttributeLayoutView'], function(TermRelationAttributeLayoutView) {
that.RRelationLayoutView.show(new TermRelationAttributeLayoutView(_.extend({}, options, {
"entityName": that.ui.title.text(),
"fetchCollection": that.getData.bind(that),
"data": that.data
})));
if (that.RRelationLayoutView) {
that.RRelationLayoutView.show(new TermRelationAttributeLayoutView(_.extend({}, options, {
"entityName": that.ui.title.text(),
"fetchCollection": that.getData.bind(that),
"data": that.data
})));
}
});
},
});
......
dashboardv2/public/js/views/glossary/TermRelationAttributeLayoutView.js
......@@ -231,7 +231,7 @@ define(['require',
getTerms: function(key) {
var terms = _.map(that.data[key], function(obj) {
var name = _.escape(obj.displayText);
return '<span class="btn btn-action btn-sm btn-icon btn-blue" title=' + _.escape(name) + ' data-id="termClick"><span>' + name + '</span><i class="fa fa-close" data-id="deleteAttribute" data-attributename="' + key + '" data-termguid="' + obj.termGuid + '" data-type="term" title="Remove Term"></i></span>';
return '<span data-guid="' + obj.termGuid + '" class="btn btn-action btn-sm btn-icon btn-blue" title=' + _.escape(name) + ' data-id="termClick"><span>' + name + '</span><i class="fa fa-close" data-id="deleteAttribute" data-attributename="' + key + '" data-termguid="' + obj.termGuid + '" data-type="term" title="Remove Term"></i></span>';
}).join(""),
attributeButtons = "";
if (terms.length) {
......
dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js
......@@ -102,9 +102,11 @@ define(['require',
var that = this;
require(['utils/TableLayout'], function(TableLayout) {
var cols = new Backgrid.Columns(that.getSchemaTableColumns());
that.RTagTableLayoutView.show(new TableLayout(_.extend({}, that.commonTableOptions, {
columns: cols
})));
if (that.RTagTableLayoutView) {
that.RTagTableLayoutView.show(new TableLayout(_.extend({}, that.commonTableOptions, {
columns: cols
})));
}
});
},
getSchemaTableColumns: function(options) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment