https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |martin.renvoize@ptfs-europe | |.com --- Comment #2 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- *** Bug 25001 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Lisette Scheer <lisetteslatah@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |lisetteslatah@gmail.com --- Comment #4 from Lisette Scheer <lisetteslatah@gmail.com> --- (In reply to Owen Leonard from comment #1)

Maybe "News and content" ?

It's technically redundant but I worry that people will wonder where News went.

+1 We still use this for news and I think it would confuse some of our folks who use that feature. -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 --- Comment #6 from Lisette Scheer <lisetteslatah@gmail.com> --- (In reply to Lucas Gass from comment #5)

Some librarians use a lot of News items (both in slips and in the the OPAC ). That makes for a lot of clutter once we start adding the HTML preferences. What are the thoughts of separating these into separate 'Tools'?

-News -Another section for "HTML customization" or whatever is decided to call it

This is even better. Especially in consortium where different libraries might all be using the news for different things, it could be very clunky to have all the news + these content fields we are moving into the news. -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |https://bugs.koha-community | |.org/bugzilla3/show_bug.cgi | |?id=22544 -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Ed Veal <eveal@mckinneytexas.org> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |eveal@mckinneytexas.org --- Comment #7 from Ed Veal <eveal@mckinneytexas.org> --- I support separating news and html customizations. -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Séverine Queune <severine.queune@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |severine.queune@bulac.fr -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Michael Adamyk <madamyk@ckls.org> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |madamyk@ckls.org --- Comment #9 from Michael Adamyk <madamyk@ckls.org> --- +1 to separating them. News is extremely cluttered now (as a consortium). -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 --- Comment #10 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Please help bug 22544 if you want to see this move forward. -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 --- Comment #11 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- I am suggesting: * Codebase will use "additional_contents", Koha::AdditionalContents * UI will split: Tools > News (same as now) Tools > HTML customization Would that work for everybody? -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Assignee|koha-bugs@lists.koha-commun |jonathan.druart+koha@gmail. |ity.org |com -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 --- Comment #13 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 122737 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=122737&action=edit Bug 24387: Rename "News" with "Additional contents" One big patch for one big move. The "News" feature (opac_news) has been hijacked to handle some system preferences (bug 26050). The goal was to take profit of the UI (editor) and the ability to translate the value. Disclaimer: This patch is NOT offering the best implementation but, as we still don't have bug 24975, it cannot be done now. And no, we don't want to wait for it to move forward here. This patch is going into the right direction anyway. This enhancement is going to rename the "News" with a more genertic "Additional contents". We have two different "categories" of content: "news" and "html customizations". What does it bring? - A split on the UI for disambigate the two types of content (news and syspref/html customizations) - A simplification of the edit form: all languages will be translatable on the same view (like the "notice templates") - Ground will be prepared for different types of content (if needed later) - Staff news can be translated How was the "News" area working before this patch? The opac_news DB table contained a (very inconsistent) 'lang' column. The different values were: - '' => news to display at the OPAC and staff interfaces - 'koha' => news for staff only - 'slip' => news for slip notices - $lang => news for OPAC only, translated in $lang ('en', 'es-ES', etc.) - "$location_$lang" => A syspref moved to this "news" area. The syspref is $location, and is translated in $lang. Eg. OpacLoginInstructions_en, OpacLoginInstructions_fr-FR, opacheader_es-ES This patch is improving the DB structure with the following changes: - renaming 'opac_news' with 'additional_contents' - new 'category' column => 'news' or 'html_customizations' - new 'location' column => For 'news': 'staff_and_opac', 'staff_only', 'slip' => For 'html_customizations': the old syspref name (eg. 'OpacLoginInstructions'). - new 'code' column (see later for more info) - the 'lang' column will only contain the language code ('en', 'es-ES', etc.). BUT a 'default' entry will ALWAYS exist for fallback behaviour. We are getting closer to the 'notice template' table structure because we want to match its UI. The 'code' column will bring us the ability to group the different 'additional_contents' rows. The code for a given news will be the same, but the (lang, title, content) will differ. Examples: News 1 will have, for each of the translated versions (category, code, location, branchcode) ('news', 'News1', $location, $branchcode||undef) And the 3 following columns will differ: (title, content, lang) ('title for news 1', 'content for news 1', 'default') ('titulo para 1', 'contenido para 1', 'es-ES') Note that the "category" is not strictely necessary, but it seems better to have the ability to split the different content by category/type easily. Additional changes: - Syspref 'NewsToolEditor' is renamed 'AdditionalContentsEditor' - Koha::NewItem => Koha::AdditionalContent - Koha::News => Koha::AdditionalContents - Script and template renamed from koha-news to additional-contents - Foreign keys have been renamed - Subpermission edit_news has been renamed edit_additional_contents - The UI can now be accessed via a "News" or "HTML customizations" link from the tools module. The related contents will then be displayed (both categories are now split) Changes not done here: - Primary key 'idnew' could be renamed 'id' Limitations of the upgrade: News cannot be grouped by a unique code for existing translations. => A given news will be now displayed several times on the translated interface Any ideas to improve the upgrade behaviour? We will have to add a warning in the release notes to tell libraries to review their news. Test plan: 0. Don't apply the patches 1. Translate the interfaces in some languages . Create some news for staff and OPAC . Create some content for different entry of HTML customizations Note that you are forced to define a 'default'. Also note that you are only forced to fill the title (not the content). This is certainly problematic (see FIXME in the code) as sometime only the content is displayed. . Play with the interface (edit, delete, filter) . Go to the different places the news are displayed, and confirm they are displayed correctly (staff home, opac home, opac rss) . Create 1+ news for 'slip', check an item out and 'print slip' (from the circulation page). You must see the news. . Go to the different places you are expecting the HTML customizations to be present and confirm that you see them. . Switch the lang of the interface and confirm that you now see the content in the translated version . Generate the templates in another language, don't translate the content . Use this language for the interface and confirm that the 'default' version is displauyed. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 --- Comment #15 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Some screenshots: https://snipboard.io/WspLi3.jpg https://snipboard.io/XRE3Mq.jpg https://snipboard.io/z3UY5q.jpg https://snipboard.io/oa7LQf.jpg https://snipboard.io/lYPyjw.jpg -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 --- Comment #17 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- (In reply to Martin Renvoize from comment #16)

I still prefer 'Blocks' or 'Content blocks' but am happy to be overruled there.

Well, Katrin disagreed on that one, and that's why I've asked here before starting two days ago! :D Now it will be quite a nightmare to replace all the occurrences (script and template names, DB table, variables, modules...)

However, this isn't working fully for me.. in the HTML Customisations screen if I attempt to edit an existing block the Display locations dropdown only shows the News options and not the Nav blocks etc.

Indeed, patch on its way!

As later change, I'd love to see a more visual display on the blocks page highlighting where the blocks of content will actually appear rather than just a table.. but that's certainly a later enhancement.

Can you detail? -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 --- Comment #19 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- And I finally forgot to write those tests for search_for_display! Will do next week if I don't forget. It does not prevent testing ;) -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #122748|Dump data for opac_news to |Dump of dumb data for description|replay the db rev easily |opac_news to replay the db | |rev easily -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |josef.moravec@gmail.com --- Comment #21 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- *** Bug 27451 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 --- Comment #23 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- *** Bug 24766 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 --- Comment #25 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 122873 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=122873&action=edit Bug 24387: Fix location options when editing HTML custom -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #122872|0 |1 is obsolete| | --- Comment #27 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 122878 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=122878&action=edit Bug 24387: Rename "News" with "Additional contents" One big patch for one big move. The "News" feature (opac_news) has been hijacked to handle some system preferences (bug 26050). The goal was to take profit of the UI (editor) and the ability to translate the value. Disclaimer: This patch is NOT offering the best implementation but, as we still don't have bug 24975, it cannot be done now. And no, we don't want to wait for it to move forward here. This patch is going into the right direction anyway. This enhancement is going to rename the "News" with a more genertic "Additional contents". We have two different "categories" of content: "news" and "html customizations". What does it bring? - A split on the UI for disambigate the two types of content (news and syspref/html customizations) - A simplification of the edit form: all languages will be translatable on the same view (like the "notice templates") - Ground will be prepared for different types of content (if needed later) - Staff news can be translated How was the "News" area working before this patch? The opac_news DB table contained a (very inconsistent) 'lang' column. The different values were: - '' => news to display at the OPAC and staff interfaces - 'koha' => news for staff only - 'slip' => news for slip notices - $lang => news for OPAC only, translated in $lang ('en', 'es-ES', etc.) - "$location_$lang" => A syspref moved to this "news" area. The syspref is $location, and is translated in $lang. Eg. OpacLoginInstructions_en, OpacLoginInstructions_fr-FR, opacheader_es-ES This patch is improving the DB structure with the following changes: - renaming 'opac_news' with 'additional_contents' - new 'category' column => 'news' or 'html_customizations' - new 'location' column => For 'news': 'staff_and_opac', 'staff_only', 'slip' => For 'html_customizations': the old syspref name (eg. 'OpacLoginInstructions'). - new 'code' column (see later for more info) - the 'lang' column will only contain the language code ('en', 'es-ES', etc.). BUT a 'default' entry will ALWAYS exist for fallback behaviour. We are getting closer to the 'notice template' table structure because we want to match its UI. The 'code' column will bring us the ability to group the different 'additional_contents' rows. The code for a given news will be the same, but the (lang, title, content) will differ. Examples: News 1 will have, for each of the translated versions (category, code, location, branchcode) ('news', 'News1', $location, $branchcode||undef) And the 3 following columns will differ: (title, content, lang) ('title for news 1', 'content for news 1', 'default') ('titulo para 1', 'contenido para 1', 'es-ES') Note that the "category" is not strictely necessary, but it seems better to have the ability to split the different content by category/type easily. Additional changes: - Syspref 'NewsToolEditor' is renamed 'AdditionalContentsEditor' - Koha::NewItem => Koha::AdditionalContent - Koha::News => Koha::AdditionalContents - Script and template renamed from koha-news to additional-contents - Foreign keys have been renamed - Subpermission edit_news has been renamed edit_additional_contents - The UI can now be accessed via a "News" or "HTML customizations" link from the tools module. The related contents will then be displayed (both categories are now split) Changes not done here: - Primary key 'idnew' could be renamed 'id' Limitations of the upgrade: News cannot be grouped by a unique code for existing translations. => A given news will be now displayed several times on the translated interface Any ideas to improve the upgrade behaviour? We will have to add a warning in the release notes to tell libraries to review their news. Test plan: 0. Don't apply the patches 1. Translate the interfaces in some languages . Create some news for staff and OPAC . Create some content for different entry of HTML customizations Note that you are forced to define a 'default'. Also note that you are only forced to fill the title (not the content). This is certainly problematic (see FIXME in the code) as sometime only the content is displayed. . Play with the interface (edit, delete, filter) . Go to the different places the news are displayed, and confirm they are displayed correctly (staff home, opac home, opac rss) . Create 1+ news for 'slip', check an item out and 'print slip' (from the circulation page). You must see the news. . Go to the different places you are expecting the HTML customizations to be present and confirm that you see them. . Switch the lang of the interface and confirm that you now see the content in the translated version . Generate the templates in another language, don't translate the content . Use this language for the interface and confirm that the 'default' version is displauyed. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #122874|0 |1 is obsolete| | --- Comment #29 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 122880 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=122880&action=edit Bug 24387: DBIC schema changes Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- QA Contact|testopia@bugs.koha-communit |tomascohen@gmail.com |y.org | CC| |tomascohen@gmail.com -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #122878|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 --- Comment #31 from Tomás Cohen Arazi <tomascohen@gmail.com> --- Created attachment 123730 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=123730&action=edit Bug 24387: Rename "News" with "Additional contents" One big patch for one big move. The "News" feature (opac_news) has been hijacked to handle some system preferences (bug 26050). The goal was to take profit of the UI (editor) and the ability to translate the value. Disclaimer: This patch is NOT offering the best implementation but, as we still don't have bug 24975, it cannot be done now. And no, we don't want to wait for it to move forward here. This patch is going into the right direction anyway. This enhancement is going to rename the "News" with a more genertic "Additional contents". We have two different "categories" of content: "news" and "html customizations". What does it bring? - A split on the UI for disambigate the two types of content (news and syspref/html customizations) - A simplification of the edit form: all languages will be translatable on the same view (like the "notice templates") - Ground will be prepared for different types of content (if needed later) - Staff news can be translated How was the "News" area working before this patch? The opac_news DB table contained a (very inconsistent) 'lang' column. The different values were: - '' => news to display at the OPAC and staff interfaces - 'koha' => news for staff only - 'slip' => news for slip notices - $lang => news for OPAC only, translated in $lang ('en', 'es-ES', etc.) - "$location_$lang" => A syspref moved to this "news" area. The syspref is $location, and is translated in $lang. Eg. OpacLoginInstructions_en, OpacLoginInstructions_fr-FR, opacheader_es-ES This patch is improving the DB structure with the following changes: - renaming 'opac_news' with 'additional_contents' - new 'category' column => 'news' or 'html_customizations' - new 'location' column => For 'news': 'staff_and_opac', 'staff_only', 'slip' => For 'html_customizations': the old syspref name (eg. 'OpacLoginInstructions'). - new 'code' column (see later for more info) - the 'lang' column will only contain the language code ('en', 'es-ES', etc.). BUT a 'default' entry will ALWAYS exist for fallback behaviour. We are getting closer to the 'notice template' table structure because we want to match its UI. The 'code' column will bring us the ability to group the different 'additional_contents' rows. The code for a given news will be the same, but the (lang, title, content) will differ. Examples: News 1 will have, for each of the translated versions (category, code, location, branchcode) ('news', 'News1', $location, $branchcode||undef) And the 3 following columns will differ: (title, content, lang) ('title for news 1', 'content for news 1', 'default') ('titulo para 1', 'contenido para 1', 'es-ES') Note that the "category" is not strictely necessary, but it seems better to have the ability to split the different content by category/type easily. Additional changes: - Syspref 'NewsToolEditor' is renamed 'AdditionalContentsEditor' - Koha::NewItem => Koha::AdditionalContent - Koha::News => Koha::AdditionalContents - Script and template renamed from koha-news to additional-contents - Foreign keys have been renamed - Subpermission edit_news has been renamed edit_additional_contents - The UI can now be accessed via a "News" or "HTML customizations" link from the tools module. The related contents will then be displayed (both categories are now split) Changes not done here: - Primary key 'idnew' could be renamed 'id' Limitations of the upgrade: News cannot be grouped by a unique code for existing translations. => A given news will be now displayed several times on the translated interface Any ideas to improve the upgrade behaviour? We will have to add a warning in the release notes to tell libraries to review their news. Test plan: 0. Don't apply the patches 1. Translate the interfaces in some languages . Create some news for staff and OPAC . Create some content for different entry of HTML customizations Note that you are forced to define a 'default'. Also note that you are only forced to fill the title (not the content). This is certainly problematic (see FIXME in the code) as sometime only the content is displayed. . Play with the interface (edit, delete, filter) . Go to the different places the news are displayed, and confirm they are displayed correctly (staff home, opac home, opac rss) . Create 1+ news for 'slip', check an item out and 'print slip' (from the circulation page). You must see the news. . Go to the different places you are expecting the HTML customizations to be present and confirm that you see them. . Switch the lang of the interface and confirm that you now see the content in the translated version . Generate the templates in another language, don't translate the content . Use this language for the interface and confirm that the 'default' version is displauyed. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 --- Comment #33 from Tomás Cohen Arazi <tomascohen@gmail.com> --- Created attachment 123732 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=123732&action=edit Bug 24387: DBIC schema changes Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 --- Comment #35 from Tomás Cohen Arazi <tomascohen@gmail.com> --- Created attachment 123734 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=123734&action=edit Bug 24387: (QA follow-up) Fix method import issues Raised by the QA script, a couple issues carried by pre-17600 patches. Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 --- Comment #37 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 123795 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=123795&action=edit Bug 24387: Fix sample_news.yml installer file -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Signed Off --- Comment #39 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- (In reply to Tomás Cohen Arazi from comment #36)

Some DB columns are missing default values (category, code and location):

DBD::mysql::db do failed: Field 'code' doesn't have a default value at /kohadevbox/koha/C4/Installer.pm line 572.

It's the installer file that was missing values for those columns! Thx! -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #123795|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 --- Comment #40 from Tomás Cohen Arazi <tomascohen@gmail.com> --- Created attachment 123797 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=123797&action=edit Bug 24387: Fix sample_news.yml installer file Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Failed QA --- Comment #42 from Tomás Cohen Arazi <tomascohen@gmail.com> --- This action will erase all your data. Are you sure? (y/N) y Running [sudo koha-shell kohadev -p -c 'PERL5LIB=/kohadevbox/koha:/kohadevbox/koha/lib:/kohadevbox/qa-test-tools perl /kohadevbox/misc4dev/populate_db.pl -v --opac-base-url http://kohadev.myDNSname.org:8080 --intranet-base-url http://kohadev-intra.myDNSname.org:8081 --marcflavour MARC21']... C4::Installer::load_sql returned the following errors while attempting to load /kohadevbox/koha/installer/data/mysql/en/optional/sample_news.yml: DBD::mysql::db do failed: Field 'code' doesn't have a default value at /kohadevbox/koha/C4/Installer.pm line 572. Inserting koha db structure... -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 --- Comment #44 from Tomás Cohen Arazi <tomascohen@gmail.com> --- My setup is KTD, using master-buster and mariadb:10.3 -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Signed Off --- Comment #46 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- (In reply to Tomás Cohen Arazi from comment #44)

My setup is KTD, using master-buster and mariadb:10.3

Same here but with mariadb 10:1:48. The code was missing from yml, obvious mistake, sorry about that. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords| |release-notes-needed -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 --- Comment #49 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Pushed to master for 21.11, thanks to everybody involved! -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 --- Comment #51 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 123855 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=123855&action=edit Bug 24387: Fix AdditionalContents.t -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 --- Comment #53 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Last 3 patches pushed to master. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Text to go in the|This enhancement is |This enhancement is release notes|renaming the "News" tool |renaming the "News" tool to |with a more generic |the more generic |"Additional contents". |"Additional contents". |It |It |creates two different |creates two different |"categories" of content: |"categories" of content: |"news" and "html |"news" and "HTML |customizations". |customizations". -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 --- Comment #54 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Created attachment 124867 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=124867&action=edit Bug 24387: Entries with parent are missing a code We executed the same 2 queries, we want to adjust the code for the parent and the language specific row. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |29042 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29042 [Bug 29042] Improve formatting of entry form in Additional Contents -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |nick@bywatersolutions.com --- Comment #56 from Nick Clemens <nick@bywatersolutions.com> --- (In reply to Jonathan Druart from comment #54)

Created attachment 124867 [details] [review] Bug 24387: Entries with parent are missing a code

We executed the same 2 queries, we want to adjust the code for the parent and the language specific row.

(In reply to Nick Clemens from comment #55)

Created attachment 125545 [details] [review] Bug 24387: Entries with parent are missing a code

We executed the same 2 queries, we want to adjust the code for the parent and the language specific row.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Read code, did not test, but the change makes logical sense -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords|additional_work_needed | Blocks| |29113 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29113 [Bug 29113] Required new "code" field for additional contents appears unnecessary -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Lucas Gass <lucas@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |29153 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29153 [Bug 29153] CodeMirror broken on additional-contents.pl -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |29424 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29424 [Bug 29424] Replace the table on 'HTML customisations' administration with a visual alternative. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |29528 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29528 [Bug 29528] Breadcrumbs on HTML customizations take you to news -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |29717 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29717 [Bug 29717] Too many DateTime manipulation in tools/additional-contents.pl -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |29805 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29805 [Bug 29805] Database update fails in MySQL 5.7 because it's missing REGEXP_REPLACE -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |29778 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29778 [Bug 29778] Deleting additional_contents leaves entries for additional languages -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 --- Comment #59 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- + $new_lang = "default" if $new_lang eq 'en'; # Assume that "en" is "default" Dont like this assumption after all ;) -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 --- Comment #61 from Fridolin Somers <fridolin.somers@biblibre.com> --- Same for us french. We fixed manually after upgrade. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 --- Comment #63 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- What did you fix, and how? -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 --- Comment #65 from Fridolin Somers <fridolin.somers@biblibre.com> --- (In reply to Jonathan Druart from comment #63)

What did you fix, and how?

Same for us. And before upgrade we looked where custom block is only 'fr-FR' to change it in 'en'. So that is becomes default after upgrade. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 --- Comment #67 from Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com> --- I'm trying to figure out how to NOT have to do manual changes after the upgrade as we're about to upgrade ~60 installations from 21.05 to 22.05. I have an instance with 4 'OpacMainUserBlock' news, two in fr-CA and two in en. They each are the translation of the other (i.e. en #1 is the translation of fr-CA #1 and en #2 is the translation of fr-CA #2). Although It's not evident in the db and I don't think the dbrev can do anything about it. (And what's worse is that this particular library just copied the French text into the english news... but we won't take that into account.) select idnew, branchcode, title, lang, published_on, updated_on, expirationdate, number, borrowernumber from opac_news where lang like "%OpacMainUserBlock%"; +-------+------------+-------------------------+-------------------------+--------------+---------------------+----------------+--------+----------------+ | idnew | branchcode | title | lang | published_on | updated_on | expirationdate | number | borrowernumber | +-------+------------+-------------------------+-------------------------+--------------+---------------------+----------------+--------+----------------+ | 19 | NULL | OpacMainUserBlock_fr-CA | OpacMainUserBlock_fr-CA | 2021-02-01 | 2022-09-27 11:49:20 | NULL | 0 | NULL | | 20 | NULL | OpacMainUserBlock_en | OpacMainUserBlock_en | 2021-02-01 | 2022-09-27 11:49:20 | NULL | 0 | NULL | | 31 | NULL | Ouverture | OpacMainUserBlock_fr-CA | 2021-06-22 | 2022-08-10 10:08:52 | NULL | 1 | 1 | | 32 | NULL | Welcome | OpacMainUserBlock_en | 2021-06-22 | 2022-08-10 10:08:52 | NULL | 1 | 1 | +-------+------------+-------------------------+-------------------------+--------------+---------------------+----------------+--------+----------------+ 4 rows in set (0.000 sec) After the upgrade, I have six 'OpacMainUserBlock' contents, four defaults and two fr-CA. It seems like it doubled the fr-CA ones (one default and one fr-CA for each) and changed the en ones into default. select idnew, category, code, location, branchcode, title, lang, published_on, expirationdate, number, borrowernumber from additional_contents where location = 'OpacMainUserBlock' order by code; +-------+---------------------+---------+-------------------+------------+-------------------------+---------+--------------+----------------+--------+----------------+ | idnew | category | code | location | branchcode | title | lang | published_on | expirationdate | number | borrowernumber | +-------+---------------------+---------+-------------------+------------+-------------------------+---------+--------------+----------------+--------+----------------+ | 20 | html_customizations | News_20 | OpacMainUserBlock | NULL | OpacMainUserBlock_en | default | 2021-02-01 | NULL | 0 | NULL | | 32 | html_customizations | News_32 | OpacMainUserBlock | NULL | Welcome | default | 2021-06-22 | NULL | 1 | 1 | | 19 | html_customizations | News_49 | OpacMainUserBlock | NULL | OpacMainUserBlock_fr-CA | fr-CA | 2021-02-01 | NULL | 0 | NULL | | 49 | html_customizations | News_49 | OpacMainUserBlock | NULL | OpacMainUserBlock_fr-CA | default | 2021-02-01 | NULL | 0 | NULL | | 31 | html_customizations | News_55 | OpacMainUserBlock | NULL | Ouverture | fr-CA | 2021-06-22 | NULL | 1 | 1 | | 55 | html_customizations | News_55 | OpacMainUserBlock | NULL | Ouverture | default | 2021-06-22 | NULL | 1 | 1 | +-------+---------------------+---------+-------------------+------------+-------------------------+---------+--------------+----------------+--------+----------------+ 6 rows in set (0.000 sec) The contents are doubled everywhere in the OPAC, both in English and French. So I think default appears no matter which language were on? I'm wondering if it's necessary to create defaults? It was not possible to have that before with the news, it had to be in either language. So I don't think it makes sense to create a default in the course of the upgrade... (It's fine to use default after of course). -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords| |additional_work_needed --- Comment #69 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Thanks Blou! I've marked this as "additional_work_needed" to get some attention, but as this bug has already been released and we don't want it to show up in release notes again, we should move the follow-up to a separate bug where we can also highlight it as a fix for a bad bug. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24387 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords|additional_work_needed | --- Comment #70 from Tomás Cohen Arazi <tomascohen@gmail.com> --- (In reply to Katrin Fischer from comment #69)

Thanks Blou! I've marked this as "additional_work_needed" to get some attention, but as this bug has already been released and we don't want it to show up in release notes again, we should move the follow-up to a separate bug where we can also highlight it as a fix for a bad bug.

Moved to bug 32110 to get proper QA on it. -- You are receiving this mail because: You are watching all bug changes.