Description
Marcel de Rooy
2021-09-30 12:25:43 UTC
(In reply to Marcel de Rooy from comment #0) > Would be nice to have in more than one language. > What would be the best way to achieve that? > > [3] Your solution ? Add to "HTML customizations?"
> Add to "HTML customizations
My first thought too.
Created attachment 138473 [details] [review] Bug 29144: First sort the HTML options Test plan: Check result while adding a new HTML customization entry. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Created attachment 138474 [details] [review] Bug 29144: Add OpacBranchInfo as HTML option, show it on opac Test plan: Add a few OpacBranchInfo for libraries. Verify that opac-library shows the correct info per library. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Still work in progress Created attachment 138527 [details] [review] Bug 29144: (follow-up) Terminology: rename to OpacLibraryInfo git grep -l OpacBranchInfo | xargs sed -i -e's/OpacBranchInfo/OpacLibraryInfo/g' Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Created attachment 138528 [details] [review] Bug 29144: Add $contents->find_best_match, $library->opac_info Test plan: Run t/db_dependent/Koha/AdditionalContents.t Run t/db_dependent/Koha/Library.t Note: You may need to set ListOwnershipUponPatronDeletion to delete to fix a pending issue in patron->delete with lists. Created attachment 138599 [details] [review] Bug 29144: First sort the HTML options Test plan: Check result while adding a new HTML customization entry. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Created attachment 138600 [details] [review] Bug 29144: Add OpacBranchInfo as HTML option, show it on opac Test plan: Add a few OpacBranchInfo for libraries. Verify that opac-library shows the correct info per library. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Created attachment 138601 [details] [review] Bug 29144: (follow-up) Terminology: rename to OpacLibraryInfo git grep -l OpacBranchInfo | xargs sed -i -e's/OpacBranchInfo/OpacLibraryInfo/g' Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Created attachment 138602 [details] [review] Bug 29144: Add $contents->find_best_match, $library->opac_info Test plan: Run t/db_dependent/Koha/AdditionalContents.t Run t/db_dependent/Koha/Library.t Note: You may need to set ListOwnershipUponPatronDeletion to delete to fix a pending issue in patron->delete with lists. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Created attachment 138603 [details] [review] Bug 29144: Use ->opac_info in opac-library template The opac_info call uses find_best_match which does not result in the All libaries plus specific library response of AdditionalContents.get. Test plan: Revisit individual library page on OPAC. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Created attachment 138604 [details] [review] Bug 29144: Remove opac_info from GetItemsInfo Test plan: Run t/db_dependent/Items.t Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Created attachment 138605 [details] [review] Bug 29144: Show html opac_info on opac-detail page Note: This patch disables the API call (which is not really needed), and still needs attention in a following patch. Test plan: Add opac_info for two libraries and a branchurl for one of the two. Select a biblio with an item having these two libraries as either home or holding branch. Toggle OpacLocationBranchToDisplay and check items table on opac detail. Click on the library name. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Created attachment 138606 [details] [review] Bug 29144: Adjust libraries form Test plan: [1] Go to Administration / libraries. [2] Check list view. [3] Check view on individual library with/without opac info. [4] Edit individual library with/without opac info. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Created attachment 138607 [details] [review] Bug 29144: Remove opac_info from a few tests Test plan: Run t/db_dependent/Circulation/GetHardDueDate.t Run t/db_dependent/Circulation/OfflineOperation.t Run t/db_dependent/RotatingCollections.t Run t/db_dependent/api/v1/libraries.t Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Created attachment 138608 [details] [review] Bug 29144: Copy and remove branches.opac_info (dbrev) Test plan: Run dbrev. Check api URL: /api/v1/public/libraries (with/without suffix /[branch_code]. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Created attachment 138609 [details] [review] Bug 29144: (DBIx schema) Drop branches.opac_info No test plan. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Martin, saw this comment on irc: Note: You may need to set ListOwnershipUponPatronDeletion to delete to fix a pending issue in patron->delete with lists. Is that a mistake comment in `Bug 29144: Add $contents->find_best_match, $library->opac_info` No it wasnt. But in the meantime the fix for checking userenv on disown_or_delete has been pushed. So it is no longer relevant. One of the tests included a patron delete and could fail on this issue. (In reply to Marcel de Rooy from comment #19) > Martin, saw this comment on irc: > > Note: You may need to set ListOwnershipUponPatronDeletion to delete to fix a > pending issue in patron->delete with lists. > > Is that a mistake comment in `Bug 29144: Add $contents->find_best_match, > $library->opac_info` > > No it wasnt. But in the meantime the fix for checking userenv on > disown_or_delete has been pushed. So it is no longer relevant. > One of the tests included a patron delete and could fail on this issue. Bug 31288 Created attachment 139182 [details] [review] Bug 29144: First sort the HTML options Test plan: Check result while adding a new HTML customization entry. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 139183 [details] [review] Bug 29144: Add OpacBranchInfo as HTML option, show it on opac Test plan: Add a few OpacBranchInfo for libraries. Verify that opac-library shows the correct info per library. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 139184 [details] [review] Bug 29144: (follow-up) Terminology: rename to OpacLibraryInfo git grep -l OpacBranchInfo | xargs sed -i -e's/OpacBranchInfo/OpacLibraryInfo/g' Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 139185 [details] [review] Bug 29144: Add $contents->find_best_match, $library->opac_info Test plan: Run t/db_dependent/Koha/AdditionalContents.t Run t/db_dependent/Koha/Library.t Note: You may need to set ListOwnershipUponPatronDeletion to delete to fix a pending issue in patron->delete with lists. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 139186 [details] [review] Bug 29144: Use ->opac_info in opac-library template The opac_info call uses find_best_match which does not result in the All libaries plus specific library response of AdditionalContents.get. Test plan: Revisit individual library page on OPAC. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 139187 [details] [review] Bug 29144: Remove opac_info from GetItemsInfo Test plan: Run t/db_dependent/Items.t Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 139188 [details] [review] Bug 29144: Show html opac_info on opac-detail page Note: This patch disables the API call (which is not really needed), and still needs attention in a following patch. Test plan: Add opac_info for two libraries and a branchurl for one of the two. Select a biblio with an item having these two libraries as either home or holding branch. Toggle OpacLocationBranchToDisplay and check items table on opac detail. Click on the library name. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 139189 [details] [review] Bug 29144: Adjust libraries form Test plan: [1] Go to Administration / libraries. [2] Check list view. [3] Check view on individual library with/without opac info. [4] Edit individual library with/without opac info. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 139190 [details] [review] Bug 29144: Remove opac_info from a few tests Test plan: Run t/db_dependent/Circulation/GetHardDueDate.t Run t/db_dependent/Circulation/OfflineOperation.t Run t/db_dependent/RotatingCollections.t Run t/db_dependent/api/v1/libraries.t Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 139191 [details] [review] Bug 29144: Copy and remove branches.opac_info (dbrev) Test plan: Run dbrev. Check api URL: /api/v1/public/libraries (with/without suffix /[branch_code]. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 139192 [details] [review] Bug 29144: (DBIx schema) Drop branches.opac_info No test plan. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 139197 [details] [review] Bug 29144: First sort the HTML options Test plan: Check result while adding a new HTML customization entry. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 139198 [details] [review] Bug 29144: Add OpacBranchInfo as HTML option, show it on opac Test plan: Add a few OpacBranchInfo for libraries. Verify that opac-library shows the correct info per library. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 139199 [details] [review] Bug 29144: (follow-up) Terminology: rename to OpacLibraryInfo git grep -l OpacBranchInfo | xargs sed -i -e's/OpacBranchInfo/OpacLibraryInfo/g' Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 139200 [details] [review] Bug 29144: Add $contents->find_best_match, $library->opac_info Test plan: Run t/db_dependent/Koha/AdditionalContents.t Run t/db_dependent/Koha/Library.t Note: You may need to set ListOwnershipUponPatronDeletion to delete to fix a pending issue in patron->delete with lists. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 139201 [details] [review] Bug 29144: Use ->opac_info in opac-library template The opac_info call uses find_best_match which does not result in the All libaries plus specific library response of AdditionalContents.get. Test plan: Revisit individual library page on OPAC. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 139202 [details] [review] Bug 29144: Remove opac_info from GetItemsInfo Test plan: Run t/db_dependent/Items.t Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 139203 [details] [review] Bug 29144: Show html opac_info on opac-detail page Note: This patch disables the API call (which is not really needed), and still needs attention in a following patch. Test plan: Add opac_info for two libraries and a branchurl for one of the two. Select a biblio with an item having these two libraries as either home or holding branch. Toggle OpacLocationBranchToDisplay and check items table on opac detail. Click on the library name. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 139204 [details] [review] Bug 29144: Adjust libraries form Test plan: [1] Go to Administration / libraries. [2] Check list view. [3] Check view on individual library with/without opac info. [4] Edit individual library with/without opac info. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 139205 [details] [review] Bug 29144: Remove opac_info from a few tests Test plan: Run t/db_dependent/Circulation/GetHardDueDate.t Run t/db_dependent/Circulation/OfflineOperation.t Run t/db_dependent/RotatingCollections.t Run t/db_dependent/api/v1/libraries.t Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 139206 [details] [review] Bug 29144: Copy and remove branches.opac_info (dbrev) Test plan: Run dbrev. Check api URL: /api/v1/public/libraries (with/without suffix /[branch_code]. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 139207 [details] [review] Bug 29144: (DBIx schema) Drop branches.opac_info No test plan. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Created attachment 139208 [details] [review] Bug 29144: (follow-up) Fix rebase issue related to bug 31313 Fixing display of holding branch name. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> The GetItemsInfo created the need for a fast rebase: Applying: Bug 29144: Show html opac_info on opac-detail page CONFLICT (content): Merge conflict in opac/opac-detail.pl CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt Related to 31313 It needed a tiny follow-up as well to fix a rebase issue. Created attachment 139366 [details] [review] Bug 29144: First sort the HTML options Test plan: Check result while adding a new HTML customization entry. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139367 [details] [review] Bug 29144: Add OpacBranchInfo as HTML option, show it on opac Test plan: Add a few OpacBranchInfo for libraries. Verify that opac-library shows the correct info per library. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139368 [details] [review] Bug 29144: (follow-up) Terminology: rename to OpacLibraryInfo git grep -l OpacBranchInfo | xargs sed -i -e's/OpacBranchInfo/OpacLibraryInfo/g' Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139369 [details] [review] Bug 29144: Add $contents->find_best_match, $library->opac_info Test plan: Run t/db_dependent/Koha/AdditionalContents.t Run t/db_dependent/Koha/Library.t Note: You may need to set ListOwnershipUponPatronDeletion to delete to fix a pending issue in patron->delete with lists. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139370 [details] [review] Bug 29144: Use ->opac_info in opac-library template The opac_info call uses find_best_match which does not result in the All libaries plus specific library response of AdditionalContents.get. Test plan: Revisit individual library page on OPAC. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139371 [details] [review] Bug 29144: Remove opac_info from GetItemsInfo Test plan: Run t/db_dependent/Items.t Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139372 [details] [review] Bug 29144: Show html opac_info on opac-detail page Note: This patch disables the API call (which is not really needed), and still needs attention in a following patch. Test plan: Add opac_info for two libraries and a branchurl for one of the two. Select a biblio with an item having these two libraries as either home or holding branch. Toggle OpacLocationBranchToDisplay and check items table on opac detail. Click on the library name. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139373 [details] [review] Bug 29144: Adjust libraries form Test plan: [1] Go to Administration / libraries. [2] Check list view. [3] Check view on individual library with/without opac info. [4] Edit individual library with/without opac info. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139374 [details] [review] Bug 29144: Remove opac_info from a few tests Test plan: Run t/db_dependent/Circulation/GetHardDueDate.t Run t/db_dependent/Circulation/OfflineOperation.t Run t/db_dependent/RotatingCollections.t Run t/db_dependent/api/v1/libraries.t Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139375 [details] [review] Bug 29144: Copy and remove branches.opac_info (dbrev) Test plan: Run dbrev. Check api URL: /api/v1/public/libraries (with/without suffix /[branch_code]. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139376 [details] [review] Bug 29144: (DBIx schema) Drop branches.opac_info No test plan. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 139377 [details] [review] Bug 29144: (follow-up) Fix rebase issue related to bug 31313 Fixing display of holding branch name. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Great work, all working as expected, no regressions spotted and QA scripts are happy. Nicely broken down, the commits were generally easy to follow. Passing QA Created attachment 140020 [details] [review] Bug 29144: First sort the HTML options Test plan: Check result while adding a new HTML customization entry. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 140021 [details] [review] Bug 29144: Add OpacBranchInfo as HTML option, show it on opac Test plan: Add a few OpacBranchInfo for libraries. Verify that opac-library shows the correct info per library. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 140022 [details] [review] Bug 29144: (follow-up) Terminology: rename to OpacLibraryInfo git grep -l OpacBranchInfo | xargs sed -i -e's/OpacBranchInfo/OpacLibraryInfo/g' Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 140023 [details] [review] Bug 29144: Add $contents->find_best_match, $library->opac_info Test plan: Run t/db_dependent/Koha/AdditionalContents.t Run t/db_dependent/Koha/Library.t Note: You may need to set ListOwnershipUponPatronDeletion to delete to fix a pending issue in patron->delete with lists. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 140024 [details] [review] Bug 29144: Use ->opac_info in opac-library template The opac_info call uses find_best_match which does not result in the All libaries plus specific library response of AdditionalContents.get. Test plan: Revisit individual library page on OPAC. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 140025 [details] [review] Bug 29144: Show html opac_info on opac-detail page Note: This patch disables the API call (which is not really needed), and still needs attention in a following patch. Test plan: Add opac_info for two libraries and a branchurl for one of the two. Select a biblio with an item having these two libraries as either home or holding branch. Toggle OpacLocationBranchToDisplay and check items table on opac detail. Click on the library name. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 140026 [details] [review] Bug 29144: Adjust libraries form Test plan: [1] Go to Administration / libraries. [2] Check list view. [3] Check view on individual library with/without opac info. [4] Edit individual library with/without opac info. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 140027 [details] [review] Bug 29144: Remove opac_info from a few tests Test plan: Run t/db_dependent/Circulation/GetHardDueDate.t Run t/db_dependent/Circulation/OfflineOperation.t Run t/db_dependent/RotatingCollections.t Run t/db_dependent/api/v1/libraries.t Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 140028 [details] [review] Bug 29144: Copy and remove branches.opac_info (dbrev) Test plan: Run dbrev. Check api URL: /api/v1/public/libraries (with/without suffix /[branch_code]. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 140029 [details] [review] Bug 29144: (DBIx schema) Drop branches.opac_info No test plan. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 140030 [details] [review] Bug 29144: (follow-up) Fix rebase issue related to bug 31313 Fixing display of holding branch name. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Rebased for 27272 Created attachment 140707 [details] [review] Bug 29144: (QA follow-up) Make update idempotent Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Pushed to master for 22.11. Nice work everyone, thanks! Caught by Owen on IRC: DT search is broken (general search when searching for libraries). Uncaught TypeError: col.data.split is not a function It's because opac_info is searchable but "data" is a function: "data": function( row, type, val, meta ) { return ''; // provisional placeholder for opac_info }, "searchable": true, "visible": false, "orderable": false It could be considered a bug from datatables.js, but I don't think it is. We should fix branch.tt instead. (In reply to Jonathan Druart from comment #72) > Caught by Owen on IRC: DT search is broken (general search when searching > for libraries). > > Uncaught TypeError: col.data.split is not a function > > > It's because opac_info is searchable but "data" is a function: > > "data": function( row, type, val, meta ) { > return ''; // provisional placeholder for opac_info > }, > "searchable": true, > "visible": false, > "orderable": false > > It could be considered a bug from datatables.js, but I don't think it is. We > should fix branch.tt instead. Will probably open a new report for this. (In reply to Marcel de Rooy from comment #73) > > It could be considered a bug from datatables.js, but I don't think it is. We > > should fix branch.tt instead. > > Will probably open a new report for this. Bug 31842. (In reply to Marcel de Rooy from comment #73) > (In reply to Jonathan Druart from comment #72) > > Caught by Owen on IRC: DT search is broken (general search when searching > > for libraries). > > > > Uncaught TypeError: col.data.split is not a function > > > > It's because opac_info is searchable but "data" is a function: > > > > "data": function( row, type, val, meta ) { > > return ''; // provisional placeholder for opac_info > > }, > > "searchable": true, > > "visible": false, > > "orderable": false I am seeing several columns where data is a function btw. "data": function( row, type, val, meta ) { const library_info = []; "data": function( row, type, val, meta ) { var result = '<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/branches.pl?op=add_form&branchcode='+encodeURIComponent(row.library_id)+'" role="button"><i class="fa fa-pencil" aria-hidden="true"></i> '+_("Edit")+'</a>'; (In reply to Marcel de Rooy from comment #75) > (In reply to Marcel de Rooy from comment #73) > > (In reply to Jonathan Druart from comment #72) > > > Caught by Owen on IRC: DT search is broken (general search when searching > > > for libraries). > > > > > > Uncaught TypeError: col.data.split is not a function > > > > > > It's because opac_info is searchable but "data" is a function: > > > > > > "data": function( row, type, val, meta ) { > > > return ''; // provisional placeholder for opac_info > > > }, > > > "searchable": true, > > > "visible": false, > > > "orderable": false > > I am seeing several columns where data is a function btw. > > "data": function( row, type, val, meta ) { > const library_info = []; > > "data": function( row, type, val, meta ) { > var result = '<a class="btn btn-default btn-xs" > href="/cgi-bin/koha/admin/branches.pl?op=add_form& > branchcode='+encodeURIComponent(row.library_id)+'" role="button"><i > class="fa fa-pencil" aria-hidden="true"></i> '+_("Edit")+'</a>'; Addressed all three columns on bug 31842. Please test. Enhancement will not be backported to 22.05.x series |