Skip to content

[Backport 4.2.x] Metadata editor / Online resources / Fix mimeTypeStrategy parameter when adding a new online resource #9464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
josegar74 wants to merge 1 commit into
base: 4.2.x
Choose a base branch
from
+10 −3
Open

[Backport 4.2.x] Metadata editor / Online resources / Fix mimeTypeStrategy parameter when adding a new online resource #9464

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions web-ui/src/main/resources/catalog/components/edit/onlinesrc/OnlineSrcDirective.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,7 +1009,6 @@
url: fields.url,
protocol: linkToEdit.protocol,
mimeType: linkToEdit.mimeType,
mimeTypeStrategy: "mimeType",
name: fields.name,
desc: fields.desc,
applicationProfile: linkToEdit.applicationProfile,
Expand All @@ -1023,7 +1022,6 @@
scope.params.linkType = typeConfig;
scope.params.protocol = null;
scope.params.mimeType = "";
scope.mimeTypeStrategy = "mimeType";
scope.params.name = "";
scope.params.desc = "";
initMultilingualFields();
Expand Down Expand Up @@ -1209,6 +1207,15 @@
}
});

// mimeTypeStrategy is a configuration option and not a user input.
// Take it from the link type configuration rather than from the form
// state, which is reset on protocol change and may be turned into a
// multilingual object on a multilingual record.
var mimeTypeStrategy = scope.params.linkType.fields.mimeTypeStrategy;
if (angular.isDefined(mimeTypeStrategy)) {
processParams.mimeTypeStrategy = mimeTypeStrategy.value || "mimeType";
}

if (scope.isEditing) {
processParams.updateKey = scope.editingKey;
processParams.resourceIdx = scope.editingIdx;
Expand Down Expand Up @@ -1540,7 +1547,7 @@
if (newValue !== oldValue) {
scope.config.multilingualFields = [];
angular.forEach(newValue.fields, function (f, k) {
if (f.isMultilingual !== false) {
if (scope.isMdMultilingual && f.isMultilingual !== false) {
scope.config.multilingualFields.push(k);
}
});
Expand Down
Loading