-
Notifications
You must be signed in to change notification settings - Fork 14
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
New Publication Usages (Sub-usage & groups) #208
Conversation
@reiferschris Did you already test this PR on your installation? |
Hi @dagraf |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for all your work on this. It works as intended, so I approve of these changes. Unfortunately I can not comment on the code directly, so I hope someone with more programming knowledge can also review in this regard.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you @ferishili for the PR, I have written a few comments. The PR is very large, so it is quite difficult to do a comprehensive review. a few general points that i would like to add:
- Introduce typing whenever possible, in paramaters, return types etc.
- Always create new data tables in the database with ilDBInterface
A few more notes so that this is documented: With the PR, many new GUIS and especially tables and forms will be introduced. These are all elements that we will have to revise again very soon because they will no longer be available in ILIAS 10/11 (ilTableGUI, ilPropertyFormGUI, ilAdvancedSelectionListGUI, ...). this is not a criticism of the PR, but something that the community must decide whether it wants and be aware of the costs that this will cause in the future (ping @dagraf, topic for the community meeting).
functionally I could not test the PR, other people are better suited :-)
classes/Conf/PublicationUsage/class.xoctPublicationSubUsageFormGUI.php
Outdated
Show resolved
Hide resolved
classes/Conf/PublicationUsage/class.xoctPublicationSubUsageTableGUI.php
Outdated
Show resolved
Hide resolved
src/Model/Publication/Config/PublicationUsageGroupRepository.php
Outdated
Show resolved
Hide resolved
@chfsx: Thank you for your comment. Concerning your note to tables and forms: Is there an alternative for the actual solution that would be more 'sustainable'? |
@dagraf this is certainly a problem that cannot really be solved as long as we are supposed to support several versions of ILIAS. for example, the table is only available with ILIAS 8, and even then it is rather limited and certain things might not even be possible to implement. the forms are a little further along, but even there, for example, not all input options are available yet. |
Paella 7 is now merged into this PR from main! and there is no more conflicts, Therefore it is safe to merge this PR when it is approved! |
I did some testing and can confirm that all our publications still work as expected. Please be aware, that i was able to test this PR only rudimentary since we are lacking the use cases to test it proparly. Therefore and @ALL adopters: Please test this PR with your installation and configuration. Some wordings in English and especially in German need to be improved. @reiferschris is taking care of it. Thx! |
Thanks a lot @dagraf |
Thanks @reiferschris, |
Hi @chfsx, |
Hi @reiferschris, that would be great if you could also test the items we talked about. Thanks in advance. |
@ferishili |
I can confirm the improved wordings and that functions still work as expected. Therefore, and @Amstutz: Can you please review this PR and comment it if needed or merge it? Thx! |
Hi @ferishili thanks for the fix. The optional translations for the publication groups and sub-usages now work as expected. The display-name is used as a fallback in case there is no translation in the |
Hi @Amstutz, |
@ferishili We will test this PR today or tomorrow and then ask @Amstutz or @chfsx for a review. We will post the results of our tests here. |
This comment #208 (comment) was ment for a different PR. So please ignore it. This PR is acutally with @chfsx for a review. |
…ups) commit a31cf23 Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Nov 23 13:13:11 2023 +0100 bump version commit 2aca5ec Merge: 058c399 b67a7c6 Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Nov 23 13:12:31 2023 +0100 Merge branch 'main' into issue-182_oc-php-lib commit 058c399 Author: ferishili <zamanifarbod2@gmail.com> Date: Mon Nov 20 17:24:48 2023 +0100 new LocaleTraits + fix fallback display names commit 8d4f167 Author: Christoph Reifers <creifers@uni-koeln.de> Date: Mon Nov 20 13:11:10 2023 +0100 update language variables for sub-usages commit c21a67c Merge: 3abdfdc 20b22ab Author: ferishili <zamanifarbod2@gmail.com> Date: Wed Nov 15 15:35:55 2023 +0100 Merge branch 'main' into issue-182_oc-php-lib commit 3abdfdc Author: ferishili <zamanifarbod2@gmail.com> Date: Fri Nov 10 11:57:46 2023 +0100 bump plugin version to keep updates in place commit 5d29932 Merge: e145e92 e1a8b5c Author: ferishili <zamanifarbod2@gmail.com> Date: Fri Nov 10 11:54:10 2023 +0100 Merge branch 'main' into issue-182_oc-php-lib commit e145e92 Author: ferishili <zamanifarbod2@gmail.com> Date: Wed Nov 8 09:31:55 2023 +0100 add sub props into usage: according to change reqs commit fc7f013 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 16:59:19 2023 +0100 $ilDB->createTable: according to changes req commit c23bcea Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 15:31:49 2023 +0100 get rid of static: according to change reqs commit d2396e9 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 15:15:10 2023 +0100 add renderDropdowns desc: according to change reqs commit 7fbf353 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 15:04:36 2023 +0100 POST to const: according to change reqs commit ffce222 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 14:38:08 2023 +0100 fix: double $$ commit 92cd27b Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 14:37:26 2023 +0100 GET to constr: according to change reqs commit 87ae4d9 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 13:12:46 2023 +0100 3rd value in_array: according to change requests commit 38a7894 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 10:41:48 2023 +0100 apply snake_case: according to change requests commit 0919944 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 10:06:55 2023 +0100 move related js: according to change request commit 3de7def Merge: 04adccf 94f02e4 Author: ferishili <zamanifarbod2@gmail.com> Date: Fri Nov 3 10:12:17 2023 +0100 Merge branch 'main' into issue-182_oc-php-lib commit 04adccf Merge: 5c314a7 465b302 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Oct 24 15:53:06 2023 +0200 Merge branch 'main' into issue-182_oc-php-lib commit 5c314a7 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Oct 24 14:38:08 2023 +0200 fix: findOrGetInstance to apply cache! commit 1f97924 Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Oct 12 09:57:43 2023 +0200 final touches commit 3212483 Author: ferishili <zamanifarbod2@gmail.com> Date: Wed Oct 11 15:56:04 2023 +0200 delete groups missign sub unlinking commit f00b724 Author: ferishili <zamanifarbod2@gmail.com> Date: Wed Oct 11 15:33:59 2023 +0200 add display_name and extras columns to tables commit 2684abd Author: ferishili <zamanifarbod2@gmail.com> Date: Wed Oct 11 12:19:54 2023 +0200 ext_dl_source commit 113628c Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Oct 5 17:21:39 2023 +0200 fix: download the items according to their usages. commit 9defb2c Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Oct 5 11:23:58 2023 +0200 fix: variable unmachted! commit ea3ccb8 Author: ferishili <zamanifarbod2@gmail.com> Date: Wed Oct 4 15:01:32 2023 +0200 fix: dropdown rending in event tiles commit 078e8ce Merge: 87f01b3 5c925c2 Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Sep 7 10:41:29 2023 +0200 Merge branch 'main' into issue-182_oc-php-lib commit 87f01b3 Merge: 43e70fe 0cf065f Author: ferishili <zamanifarbod2@gmail.com> Date: Fri Aug 25 16:30:36 2023 +0200 Merge branch 'oc-php-lib' into issue-182_oc-php-lib commit 43e70fe Author: ferishili <zamanifarbod2@gmail.com> Date: Fri Aug 25 14:38:23 2023 +0200 refactoring rebase fixes and syncs commit e03eb89 Merge: d2d4bc6 63f88f9 Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Aug 24 17:00:02 2023 +0200 Merge branch 'oc-php-lib' into issue-182_oc-php-lib commit d2d4bc6 Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Aug 17 13:29:49 2023 +0200 fix type restriction, when importing setting commit 22bdedf Merge: 922c921 bc9b2a1 Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Aug 17 13:22:04 2023 +0200 Merge branch 'main' into issue-182 commit 922c921 Author: ferishili <zamanifarbod2@gmail.com> Date: Mon Aug 14 11:18:30 2023 +0200 first draft
…ups) commit a31cf23 Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Nov 23 13:13:11 2023 +0100 bump version commit 2aca5ec Merge: 058c399 b67a7c6 Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Nov 23 13:12:31 2023 +0100 Merge branch 'main' into issue-182_oc-php-lib commit 058c399 Author: ferishili <zamanifarbod2@gmail.com> Date: Mon Nov 20 17:24:48 2023 +0100 new LocaleTraits + fix fallback display names commit 8d4f167 Author: Christoph Reifers <creifers@uni-koeln.de> Date: Mon Nov 20 13:11:10 2023 +0100 update language variables for sub-usages commit c21a67c Merge: 3abdfdc 20b22ab Author: ferishili <zamanifarbod2@gmail.com> Date: Wed Nov 15 15:35:55 2023 +0100 Merge branch 'main' into issue-182_oc-php-lib commit 3abdfdc Author: ferishili <zamanifarbod2@gmail.com> Date: Fri Nov 10 11:57:46 2023 +0100 bump plugin version to keep updates in place commit 5d29932 Merge: e145e92 e1a8b5c Author: ferishili <zamanifarbod2@gmail.com> Date: Fri Nov 10 11:54:10 2023 +0100 Merge branch 'main' into issue-182_oc-php-lib commit e145e92 Author: ferishili <zamanifarbod2@gmail.com> Date: Wed Nov 8 09:31:55 2023 +0100 add sub props into usage: according to change reqs commit fc7f013 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 16:59:19 2023 +0100 $ilDB->createTable: according to changes req commit c23bcea Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 15:31:49 2023 +0100 get rid of static: according to change reqs commit d2396e9 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 15:15:10 2023 +0100 add renderDropdowns desc: according to change reqs commit 7fbf353 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 15:04:36 2023 +0100 POST to const: according to change reqs commit ffce222 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 14:38:08 2023 +0100 fix: double $$ commit 92cd27b Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 14:37:26 2023 +0100 GET to constr: according to change reqs commit 87ae4d9 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 13:12:46 2023 +0100 3rd value in_array: according to change requests commit 38a7894 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 10:41:48 2023 +0100 apply snake_case: according to change requests commit 0919944 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 10:06:55 2023 +0100 move related js: according to change request commit 3de7def Merge: 04adccf 94f02e4 Author: ferishili <zamanifarbod2@gmail.com> Date: Fri Nov 3 10:12:17 2023 +0100 Merge branch 'main' into issue-182_oc-php-lib commit 04adccf Merge: 5c314a7 465b302 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Oct 24 15:53:06 2023 +0200 Merge branch 'main' into issue-182_oc-php-lib commit 5c314a7 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Oct 24 14:38:08 2023 +0200 fix: findOrGetInstance to apply cache! commit 1f97924 Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Oct 12 09:57:43 2023 +0200 final touches commit 3212483 Author: ferishili <zamanifarbod2@gmail.com> Date: Wed Oct 11 15:56:04 2023 +0200 delete groups missign sub unlinking commit f00b724 Author: ferishili <zamanifarbod2@gmail.com> Date: Wed Oct 11 15:33:59 2023 +0200 add display_name and extras columns to tables commit 2684abd Author: ferishili <zamanifarbod2@gmail.com> Date: Wed Oct 11 12:19:54 2023 +0200 ext_dl_source commit 113628c Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Oct 5 17:21:39 2023 +0200 fix: download the items according to their usages. commit 9defb2c Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Oct 5 11:23:58 2023 +0200 fix: variable unmachted! commit ea3ccb8 Author: ferishili <zamanifarbod2@gmail.com> Date: Wed Oct 4 15:01:32 2023 +0200 fix: dropdown rending in event tiles commit 078e8ce Merge: 87f01b3 5c925c2 Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Sep 7 10:41:29 2023 +0200 Merge branch 'main' into issue-182_oc-php-lib commit 87f01b3 Merge: 43e70fe 0cf065f Author: ferishili <zamanifarbod2@gmail.com> Date: Fri Aug 25 16:30:36 2023 +0200 Merge branch 'oc-php-lib' into issue-182_oc-php-lib commit 43e70fe Author: ferishili <zamanifarbod2@gmail.com> Date: Fri Aug 25 14:38:23 2023 +0200 refactoring rebase fixes and syncs commit e03eb89 Merge: d2d4bc6 63f88f9 Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Aug 24 17:00:02 2023 +0200 Merge branch 'oc-php-lib' into issue-182_oc-php-lib commit d2d4bc6 Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Aug 17 13:29:49 2023 +0200 fix type restriction, when importing setting commit 22bdedf Merge: 922c921 bc9b2a1 Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Aug 17 13:22:04 2023 +0200 Merge branch 'main' into issue-182 commit 922c921 Author: ferishili <zamanifarbod2@gmail.com> Date: Mon Aug 14 11:18:30 2023 +0200 first draft
commit a31cf23 Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Nov 23 13:13:11 2023 +0100 bump version commit 2aca5ec Merge: 058c399 b67a7c6 Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Nov 23 13:12:31 2023 +0100 Merge branch 'main' into issue-182_oc-php-lib commit 058c399 Author: ferishili <zamanifarbod2@gmail.com> Date: Mon Nov 20 17:24:48 2023 +0100 new LocaleTraits + fix fallback display names commit 8d4f167 Author: Christoph Reifers <creifers@uni-koeln.de> Date: Mon Nov 20 13:11:10 2023 +0100 update language variables for sub-usages commit c21a67c Merge: 3abdfdc 20b22ab Author: ferishili <zamanifarbod2@gmail.com> Date: Wed Nov 15 15:35:55 2023 +0100 Merge branch 'main' into issue-182_oc-php-lib commit 3abdfdc Author: ferishili <zamanifarbod2@gmail.com> Date: Fri Nov 10 11:57:46 2023 +0100 bump plugin version to keep updates in place commit 5d29932 Merge: e145e92 e1a8b5c Author: ferishili <zamanifarbod2@gmail.com> Date: Fri Nov 10 11:54:10 2023 +0100 Merge branch 'main' into issue-182_oc-php-lib commit e145e92 Author: ferishili <zamanifarbod2@gmail.com> Date: Wed Nov 8 09:31:55 2023 +0100 add sub props into usage: according to change reqs commit fc7f013 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 16:59:19 2023 +0100 $ilDB->createTable: according to changes req commit c23bcea Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 15:31:49 2023 +0100 get rid of static: according to change reqs commit d2396e9 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 15:15:10 2023 +0100 add renderDropdowns desc: according to change reqs commit 7fbf353 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 15:04:36 2023 +0100 POST to const: according to change reqs commit ffce222 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 14:38:08 2023 +0100 fix: double $$ commit 92cd27b Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 14:37:26 2023 +0100 GET to constr: according to change reqs commit 87ae4d9 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 13:12:46 2023 +0100 3rd value in_array: according to change requests commit 38a7894 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 10:41:48 2023 +0100 apply snake_case: according to change requests commit 0919944 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Nov 7 10:06:55 2023 +0100 move related js: according to change request commit 3de7def Merge: 04adccf 94f02e4 Author: ferishili <zamanifarbod2@gmail.com> Date: Fri Nov 3 10:12:17 2023 +0100 Merge branch 'main' into issue-182_oc-php-lib commit 04adccf Merge: 5c314a7 465b302 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Oct 24 15:53:06 2023 +0200 Merge branch 'main' into issue-182_oc-php-lib commit 5c314a7 Author: ferishili <zamanifarbod2@gmail.com> Date: Tue Oct 24 14:38:08 2023 +0200 fix: findOrGetInstance to apply cache! commit 1f97924 Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Oct 12 09:57:43 2023 +0200 final touches commit 3212483 Author: ferishili <zamanifarbod2@gmail.com> Date: Wed Oct 11 15:56:04 2023 +0200 delete groups missign sub unlinking commit f00b724 Author: ferishili <zamanifarbod2@gmail.com> Date: Wed Oct 11 15:33:59 2023 +0200 add display_name and extras columns to tables commit 2684abd Author: ferishili <zamanifarbod2@gmail.com> Date: Wed Oct 11 12:19:54 2023 +0200 ext_dl_source commit 113628c Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Oct 5 17:21:39 2023 +0200 fix: download the items according to their usages. commit 9defb2c Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Oct 5 11:23:58 2023 +0200 fix: variable unmachted! commit ea3ccb8 Author: ferishili <zamanifarbod2@gmail.com> Date: Wed Oct 4 15:01:32 2023 +0200 fix: dropdown rending in event tiles commit 078e8ce Merge: 87f01b3 5c925c2 Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Sep 7 10:41:29 2023 +0200 Merge branch 'main' into issue-182_oc-php-lib commit 87f01b3 Merge: 43e70fe 0cf065f Author: ferishili <zamanifarbod2@gmail.com> Date: Fri Aug 25 16:30:36 2023 +0200 Merge branch 'oc-php-lib' into issue-182_oc-php-lib commit 43e70fe Author: ferishili <zamanifarbod2@gmail.com> Date: Fri Aug 25 14:38:23 2023 +0200 refactoring rebase fixes and syncs commit e03eb89 Merge: d2d4bc6 63f88f9 Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Aug 24 17:00:02 2023 +0200 Merge branch 'oc-php-lib' into issue-182_oc-php-lib commit d2d4bc6 Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Aug 17 13:29:49 2023 +0200 fix type restriction, when importing setting commit 22bdedf Merge: 922c921 bc9b2a1 Author: ferishili <zamanifarbod2@gmail.com> Date: Thu Aug 17 13:22:04 2023 +0200 Merge branch 'main' into issue-182 commit 922c921 Author: ferishili <zamanifarbod2@gmail.com> Date: Mon Aug 14 11:18:30 2023 +0200 first draft
Merged using #230 |
* main: (92 commits) using LocaleTrait everywhere needed + docs fix: Processing stdClass/null error Increased Plugin version [FIX] 212: The status of "Publish Series on VIDEOPORTAL" does not get saved New Plugin Version and Changelog Rebuilt JS after merge Merged PR opencast-ilias#208: New Publication Usages (Sub-usage & groups) Merged PR opencast-ilias#218 squashing dependabot bumps Restored JS for chat Removed Old Node Modules Updated Node-Modules and removed legacy paella player Bump engine.io and socket.io Bump socket.io-parser from 4.2.1 to 4.2.3 Bump semver from 7.3.5 to 7.5.4 [FIX] Interface of VoidContainer Updated Changelog [FIX] added check for APCu installed in form Added Readme for Cache [FIX] implemented new caching service and removed non working legacy service ... # Conflicts: # js/paella_player/config.json # js/paella_player/config_live.json # src/Chat/GUI/open_chat.php # src/Model/Event/EventAPIRepository.php
This PR solves and fixes #182,
Description
see the related issue
Solution
see the list in related issue
Concept
Instead of adding fallbacks every time, when someone needs another publication usage, this PR introduces the sub- usage method. (currently available only for download)
Beside subs, one could also group publication usages, but this only affect the presentation of those publications that will be displayed to the users like download, annotation etc.
Import/Export of newly added tables (subs and groups) are applied.
The external_download_source setting option has been taken out of the main settings area and added only into DOWNLOAD publication usages and sub-usages.
The grouped usages/sub-usages will be displayed in a dropdown in the video list. NOTE that if a group consists of only one item, the usage/sub itself will be displayed
A new field called "Display Name" is added and is also capable of being translated by only adding the related string into the lang strings like follows:
(replace {the display name in lowercase} with whatever you entered for display name)
NOTE: (UPDATED 2) This PR will increase the plugin version to
5.2.15.3.15.3.25.3.3 and needs an (db) update to apply dbupdate414243(this will have conflicts with Paella 7 #204)There is no more conflict!