From 31015b0739156ae6c4d9d9b11010e958a1940951 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Tue, 15 Jun 2021 20:03:15 +0200 Subject: [PATCH] Bugfixes for external video asset. --- .../ui/contentsections/assets/ExternalVideoAssetEditStep.java | 2 +- .../assets/ExternalVideoAssetEditStepModel.java | 4 ++++ .../external-video-asset/create-external-video-asset.xhtml | 3 +++ .../external-video-asset/edit-external-video-asset.xhtml | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalVideoAssetEditStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalVideoAssetEditStep.java index 49ea337b4..5ad93d1c0 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalVideoAssetEditStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalVideoAssetEditStep.java @@ -83,7 +83,7 @@ public class ExternalVideoAssetEditStep extends BookmarkEditStep { @Override public Class getStepClass() { - return ExternalAudioAssetEditStep.class; + return ExternalVideoAssetEditStep.class; } @Override diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalVideoAssetEditStepModel.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalVideoAssetEditStepModel.java index 6b9309fcb..9d0e71881 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalVideoAssetEditStepModel.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/ExternalVideoAssetEditStepModel.java @@ -43,6 +43,10 @@ public class ExternalVideoAssetEditStepModel { this.legalMetadata = legalMetadata; } + public String getLegalMetadataType() { + return LegalMetadata.class.getName(); + } + public String getBaseUrl() { return baseUrl; } diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/external-video-asset/create-external-video-asset.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/external-video-asset/create-external-video-asset.xhtml index 2821488bb..f844a82bf 100644 --- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/external-video-asset/create-external-video-asset.xhtml +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/external-video-asset/create-external-video-asset.xhtml @@ -76,5 +76,8 @@ + + + diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/external-video-asset/edit-external-video-asset.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/external-video-asset/edit-external-video-asset.xhtml index 9fa782ddf..86f9dfade 100644 --- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/external-video-asset/edit-external-video-asset.xhtml +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/external-video-asset/edit-external-video-asset.xhtml @@ -108,7 +108,7 @@ hasUnusedLocales="#{!CmsBookmarkEditStep.unusedDescriptionLocales.isEmpty()}" headingLevel="3" objectIdentifier="#{CmsSelectedAssetModel.assetPath}" - readOnly="#{!CmsBookmarkEditStep.canEdit}" + readOnly="#{!MvcAssetEditStepModel.canEdit}" removeButtonLabel="#{CmsAssetsStepsDefaultMessagesBundle['externalvideoasset.editstep.description.remove_button.label']}" removeDialogCancelLabel="#{CmsAssetsStepsDefaultMessagesBundle['externalvideoasset.editstep.description.remove.cancel']}" removeDialogSubmitLabel="#{CmsAssetsStepsDefaultMessagesBundle['externalvideoasset.editstep.description.remove.submit']}"