Commit e483712b by Kalyani Committed by nixonrodrigues

ATLAS-1810 : UI : Audit details of any tag event (Added,Updated) has only tag name and event.

parent d0e48cfd
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
--> -->
<h4>Name: <span data-id="tagHeader"></span></h4>
<table class="table table-bordered table-striped" data-id="tableAudit"> <table class="table table-bordered table-striped" data-id="tableAudit">
<thead> <thead>
<tr data-id="auditHeaderValue"> <tr data-id="auditHeaderValue">
......
...@@ -401,7 +401,13 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'pnotify.button ...@@ -401,7 +401,13 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'pnotify.button
return returnObj; return returnObj;
} }
if (collectionJSON.attributes.id) { if (collectionJSON.attributes.id) {
returnObj.name = _.escape(collectionJSON.attributes.id); if (_.isObject(collectionJSON.attributes.id)) {
if (collectionJSON.id.id) {
returnObj.name = _.escape(collectionJSON.attributes.id.id);
}
} else {
returnObj.name = _.escape(collectionJSON.attributes.id);
}
returnObj.key = 'id'; returnObj.key = 'id';
return returnObj; return returnObj;
} }
...@@ -427,7 +433,13 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'pnotify.button ...@@ -427,7 +433,13 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'pnotify.button
return returnObj; return returnObj;
} }
if (collectionJSON.id) { if (collectionJSON.id) {
returnObj.name = _.escape(collectionJSON.id); if (_.isObject(collectionJSON.id)) {
if (collectionJSON.id.id) {
returnObj.name = _.escape(collectionJSON.id.id);
}
} else {
returnObj.name = _.escape(collectionJSON.id);
}
returnObj.key = 'id'; returnObj.key = 'id';
return returnObj; return returnObj;
} }
......
...@@ -41,7 +41,8 @@ define(['require', ...@@ -41,7 +41,8 @@ define(['require',
auditCreate: "[data-id='auditCreate']", auditCreate: "[data-id='auditCreate']",
noData: "[data-id='noData']", noData: "[data-id='noData']",
tableAudit: "[data-id='tableAudit']", tableAudit: "[data-id='tableAudit']",
auditHeaderValue: "[data-id='auditHeaderValue']" auditHeaderValue: "[data-id='auditHeaderValue']",
tagHeader: "[data-id='tagHeader']"
}, },
/** ui events hash */ /** ui events hash */
events: function() { events: function() {
...@@ -79,13 +80,11 @@ define(['require', ...@@ -79,13 +80,11 @@ define(['require',
} }
} }
var values = parseDetailsObject.values; var values = parseDetailsObject.values;
if (this.action && (Enums.auditAction.ENTITY_CREATE !== this.action && Enums.auditAction.ENTITY_UPDATE !== this.action) && name) { if (parseDetailsObject && parseDetailsObject.values) {
this.ui.auditHeaderValue.html('<th>' + this.action + '</th>'); var tagHeader = ((name ? name : this.entityName));
this.ui.auditValue.html("<tr><td>" + (name ? name : this.entityName) + "</td></tr>"); this.ui.tagHeader.append(tagHeader);
} else if (parseDetailsObject && parseDetailsObject.values) {
this.ui.auditHeaderValue.html('<th>Key</th><th>New Value</th>'); this.ui.auditHeaderValue.html('<th>Key</th><th>New Value</th>');
//CommonViewFunction.findAndmergeRefEntity(attributeObject, that.referredEntities); table = CommonViewFunction.propertyTable({ scope: this, valueObject: values, entityDef: this.entityDef, extractJSON: { extractKey: 'value' } });
table = CommonViewFunction.propertyTable(this, values, this.entityDef);
if (table.length) { if (table.length) {
this.ui.noData.hide(); this.ui.noData.hide();
this.ui.tableAudit.show(); this.ui.tableAudit.show();
...@@ -94,9 +93,7 @@ define(['require', ...@@ -94,9 +93,7 @@ define(['require',
this.ui.noData.show(); this.ui.noData.show();
this.ui.tableAudit.hide(); this.ui.tableAudit.hide();
} }
} } else {
} else {
if (Enums.auditAction.ENTITY_DELETE === this.action) {
this.ui.auditHeaderValue.html('<th>' + this.action + '</th>'); this.ui.auditHeaderValue.html('<th>' + this.action + '</th>');
this.ui.auditValue.html("<tr><td>" + (name ? name : this.entityName) + "</td></tr>"); this.ui.auditValue.html("<tr><td>" + (name ? name : this.entityName) + "</td></tr>");
} }
......
...@@ -65,7 +65,7 @@ define(['require', ...@@ -65,7 +65,7 @@ define(['require',
}); });
attributeObject.columns = valueSorted; attributeObject.columns = valueSorted;
} }
var table = CommonViewFunction.propertyTable(this, attributeObject, this.entityDef); var table = CommonViewFunction.propertyTable({ scope: this, valueObject: attributeObject, entityDef: this.entityDef });
that.ui.detailValue.append(table); that.ui.detailValue.append(table);
} }
}); });
......
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