{{::prop.nameI18n}}:
-
+
- ←
+ ←
diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js
index ef1b370b5..362eb8089 100644
--- a/front/salix/components/log/index.js
+++ b/front/salix/components/log/index.js
@@ -64,29 +64,47 @@ export default class Controller extends Section {
set logs(value) {
this._logs = value;
if (!value) return;
+
const empty = {};
const validations = window.validations;
+ const castJsonValue = this.castJsonValue;
+
for (const log of value) {
- const oldValues = log.oldInstance || empty;
- const newValues = log.newInstance || empty;
+ const notDelete = log.action != 'delete';
+ const olds = (notDelete ? log.oldInstance : null) || empty;
+ const vals = (notDelete ? log.newInstance : log.oldInstance) || empty;
const locale = validations[log.changedModel]?.locale || empty;
log.changedModelI18n = firstUpper(locale.name) || log.changedModel;
- let props = Object.keys(oldValues).concat(Object.keys(newValues));
+ let props = Object.keys(olds).concat(Object.keys(vals));
props = [...new Set(props)];
log.props = [];
for (const prop of props) {
+ if (prop.endsWith('$')) continue;
log.props.push({
name: prop,
nameI18n: firstUpper(locale.columns?.[prop]) || prop,
- old: this.castJsonValue(oldValues[prop]),
- new: this.castJsonValue(newValues[prop])
+ old: getVal(olds, prop),
+ val: getVal(vals, prop)
});
}
log.props.sort(
(a, b) => a.nameI18n.localeCompare(b.nameI18n));
}
+
+ function getVal(vals, prop) {
+ let val, id;
+ const showProp = `${prop}$`;
+
+ if (vals[showProp] != null) {
+ val = vals[showProp];
+ id = vals[prop];
+ } else
+ val = vals[prop];
+
+ return {val: castJsonValue(val), id};
+ }
}
get models() {
@@ -113,10 +131,6 @@ export default class Controller extends Section {
: value;
}
- mainVal(prop, action) {
- return action == 'delete' ? prop.old : prop.new;
- }
-
relativeDate(dateVal) {
if (dateVal == null) return '';
const date = new Date(dateVal);
@@ -238,3 +252,12 @@ ngModule.vnComponent('vnLog', {
url: '@'
}
});
+
+ngModule.component('vnLogValue', {
+ template:
+ '