-
Notifications
You must be signed in to change notification settings - Fork 23
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.
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
Allow tracks in event asset upload #698
base: main
Are you sure you want to change the base?
Allow tracks in event asset upload #698
Conversation
Old logic dictates that media of type track cannot be in the asset upload tab of the event details or new event wizard. Since subtitles are now tracks, this logic finally breaks. Instead of relying on checking for type track to differentiate between options for source upload and asset upload, this commit instead uses the key in the list provider that is there for this exact purpose.
Use Run test server using develop.opencast.org as backend:
Specify a different backend like stable.opencast.org:
It may take a few seconds for the interface to spin up. |
This pull request is deployed at test.admin-interface.opencast.org/698/2024-08-09_12-23-28/ . |
This pull request has conflicts ☹ |
…up-in-asset-upload
This pull request has conflicts ☹ |
…up-in-asset-upload
…up-in-asset-upload
This pull request has conflicts ☹ |
…up-in-asset-upload
6200751
to
1c411b6
Compare
This pull request has conflicts ☹ |
…up-in-asset-upload
This pull request has conflicts ☹ |
…up-in-asset-upload
This pull request has conflicts ☹ |
…up-in-asset-upload
This pull request has conflicts ☹ |
…up-in-asset-upload
I still favour adding subtitles on the second page so I would like to have the option to configure Opencast in that way. But having the same file picker on two pages is obviously wrong. |
Just nagging @Arnei here that CI is broken since your last conflict resolution. Should be an easy fix. |
Use Run test server using develop.opencast.org as backend:
Specify a different backend like stable.opencast.org:
It may take a few seconds for the interface to spin up. |
This pull request is deployed at test.admin-interface.opencast.org/698/2024-11-05_10-22-07/ . |
Excuse the late response to the reviews.
I'm inclined to disagree. What is shown in the Source and Asset Upload step for new events is in the end based on I do agree though that it should be possible to configure subtitles in the asset upload for existing events, without also adding them to the asset upload step for creating new events. To that end it would make sense to me to extend the
That I would consider a bug, I would expect both files to be added. Took a quick look, and this seems to be an issue in the backend for multiple files with the same flavor. Personally, I would consider this bug a seperate issue from this PR as this PR did not add the bug, merely brought it to light. But I'm open to persuasion :) |
So you would have:
I find this confusing. What about having only one key prefix for everything and adding properties to the JSON that determine where this gets included? {
...
"group": "main", // main = first page, secondary = second page, but I'm not tight to this property
"showForNewEvents": true,
"showForExistingEvents": false,
...
} |
My idea was that keys with But I can still see why that would be confusing. Adding properties to the JSON also seems good. |
Ok, I hadn't in mind being able to configure the behaviour of the asset upload.
I also agree with this and would prefer the solution with the properties in JSON format suggested by @mtneug as I think it is easier to understand.
I agree, we should create a separate issue for this. |
Adds support for `showForNewEvents` and `showForExistingEvents`, two keys that specifically specify whether an asset upload option should show up for new events or existing events. Previously, an asset upload option would always show for new and existing events, but now this can be configured in detail.
Use Run test server using develop.opencast.org as backend:
Specify a different backend like stable.opencast.org:
It may take a few seconds for the interface to spin up. |
This pull request is deployed at test.admin-interface.opencast.org/698/2024-12-03_09-17-53/ . |
Old logic dictates that media of type track cannot be in the asset upload tab of the event details or new event wizard. Since subtitles are now tracks, this logic finally breaks.
Instead of relying on checking for type track to differentiate between options for source upload and asset upload, this commit instead uses the key in the list provider that is there for this exact purpose.
To review this, you will need an Opencast with Asset Upload configured. Check the Opencast docs on how to do that https://docs.opencast.org/develop/admin/#configuration/admin-ui/asset-upload/#manual-asset-upload. This changes behaviour for both the event details and the create event dialog.
Fixes #694.
Edit: Furthermore, this also adds support for
showForNewEvents
andshowForExistingEvents
, two keys that specifically specify whether an asset upload option should show up for new events or existing events. Previously, an asset upload option would always show for new and existing events, but now this can be configured in detail.