Skip to content

Commit be2ddcd

Browse files
committed
Use the same extra_field key on the frontend as on the backend.
1 parent 8a3d383 commit be2ddcd

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

contentcuration/contentcuration/frontend/channelEdit/components/edit/InheritAncestorMetadataModal.vue

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@
104104
// as to be inherited or not by a previous interaction with the modal.
105105
return Boolean(
106106
this.parent &&
107-
this.parent?.extra_fields?.inherit_metadata &&
107+
this.parent?.extra_fields?.inherited_metadata &&
108108
Object.keys(this.inheritableMetadataItems).every(
109-
field => !isUndefined(this.parent.extra_fields.inherit_metadata[field])
109+
field => !isUndefined(this.parent.extra_fields.inherited_metadata[field])
110110
)
111111
);
112112
},
@@ -203,10 +203,10 @@
203203
ContentNode.getAncestors(this.parent.id).then(ancestors => {
204204
for (const field of inheritableFields) {
205205
if (
206-
this.parent.extra_fields.inherit_metadata &&
207-
this.parent.extra_fields.inherit_metadata[field]
206+
this.parent.extra_fields.inherited_metadata &&
207+
this.parent.extra_fields.inherited_metadata[field]
208208
) {
209-
this.checks[field] = this.parent.extra_fields.inherit_metadata[field];
209+
this.checks[field] = this.parent.extra_fields.inherited_metadata[field];
210210
}
211211
}
212212
this.categories = ancestors.reduce((acc, ancestor) => {
@@ -258,19 +258,19 @@
258258
// but just in case, return
259259
return;
260260
}
261-
const inherit_metadata = {
262-
...(this.parent?.extra_fields.inherit_metadata || {}),
261+
const inherited_metadata = {
262+
...(this.parent?.extra_fields.inherited_metadata || {}),
263263
};
264264
for (const field of inheritableFields) {
265265
if (this.inheritableMetadataItems[field]) {
266266
// Only store preferences for fields that have been shown to the user as inheritable
267-
inherit_metadata[field] = this.checks[field];
267+
inherited_metadata[field] = this.checks[field];
268268
}
269269
}
270270
this.updateContentNode({
271271
id: this.parent.id,
272272
extra_fields: {
273-
inherit_metadata,
273+
inherited_metadata,
274274
},
275275
});
276276
},

contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,8 @@ function generateContentNodeData({
322322
if (extra_fields.suggested_duration_type) {
323323
contentNodeData.extra_fields.suggested_duration_type = extra_fields.suggested_duration_type;
324324
}
325-
if (extra_fields.inherit_metadata) {
326-
contentNodeData.extra_fields.inherit_metadata = extra_fields.inherit_metadata;
325+
if (extra_fields.inherited_metadata) {
326+
contentNodeData.extra_fields.inherited_metadata = { ...extra_fields.inherited_metadata };
327327
}
328328
}
329329
if (prerequisite !== NOVALUE) {
@@ -369,11 +369,11 @@ export function updateContentNode(context, { id, mergeMapFields, ...payload } =
369369
};
370370
}
371371

372-
if (contentNodeData.extra_fields.inherit_metadata) {
373-
// Don't set inherit_metadata on non-topic nodes
372+
if (contentNodeData.extra_fields.inherited_metadata) {
373+
// Don't set inherited_metadata on non-topic nodes
374374
// as they cannot have children to bequeath metadata to
375375
if (node.kind !== ContentKindsNames.TOPIC) {
376-
delete contentNodeData.extra_fields.inherit_metadata;
376+
delete contentNodeData.extra_fields.inherited_metadata;
377377
}
378378
}
379379

0 commit comments

Comments
 (0)