Bugzilla – Attachment 179379 Details for
Bug 39350
The language switch is not displayed at the bottom of ERM module pages
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 39350: (bug 38664 follow-up) Restore language selector for Vue.js module
Bug-39350-bug-38664-follow-up-Restore-language-sel.patch (text/plain), 7.59 KB, created by
Jonathan Druart
on 2025-03-17 08:43:16 UTC
(
hide
)
Description:
Bug 39350: (bug 38664 follow-up) Restore language selector for Vue.js module
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2025-03-17 08:43:16 UTC
Size:
7.59 KB
patch
obsolete
>From b61aaf2b8ca529f87d47d7eeea0300231182f342 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Mon, 17 Mar 2025 09:39:47 +0100 >Subject: [PATCH] Bug 39350: (bug 38664 follow-up) Restore language selector > for Vue.js module > >ERM and Preservation modules have lost the language selector during the >tidy work. >There has been a closing div added to the "home" files, which broke the >HTML structure. > >Test plan: >Have more than one language selected for StaffInterfaceLanguages. >Go to the ERM and Preservation module and confirm that with this patch >applied the language selector menu is displayed. >--- > .../intranet-tmpl/prog/en/modules/erm/erm.tt | 58 +++++++++---------- > .../prog/en/modules/preservation/home.tt | 36 ++++++------ > 2 files changed, 45 insertions(+), 49 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/erm/erm.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/erm/erm.tt >index a662808540a..8032e68a1da 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/erm/erm.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/erm/erm.tt >@@ -21,37 +21,35 @@ > [% INCLUDE 'erm-search.inc' %] > [% END %] > >-<div id="erm"> >- <!-- this is closed in intranet-bottom.inc --> >+<div id="erm"></div> > >- [% MACRO jsinclude BLOCK %] >- [% INCLUDE 'calendar.inc' %] >- [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'js-patron-format.inc' %] >- [% INCLUDE 'js-date-format.inc' %] >- <script> >- const agreement_table_settings = [% TablesSettings.GetTableSettings( 'erm', 'agreements', 'agreements', 'json' ) | $raw %]; >- const license_table_settings = [% TablesSettings.GetTableSettings( 'erm', 'licenses', 'licenses', 'json' ) | $raw %]; >- const eholdings_packages_table_settings = [% TablesSettings.GetTableSettings( 'erm', 'eholdings', 'packages', 'json' ) | $raw %]; >- const eholdings_titles_table_settings = [% TablesSettings.GetTableSettings( 'erm', 'eholdings', 'titles', 'json' ) | $raw %]; >- const usage_data_provider_table_settings = [% TablesSettings.GetTableSettings( 'erm', 'usage_data_providers', 'usage_data_providers', 'json' ) | $raw %]; >- const title_table_settings = [% TablesSettings.GetTableSettings( 'erm', 'titles', 'titles', 'json' ) | $raw %]; >- const counter_log_table_settings = [% TablesSettings.GetTableSettings( 'erm', 'counter_logs', 'counter_logs', 'json' ) | $raw %]; >- const monthly_usage_table_settings = [% TablesSettings.GetTableSettings( 'erm', 'monthly_usages', 'monthly_usages', 'json' ) | $raw %]; >- const yearly_usage_table_settings = [% TablesSettings.GetTableSettings( 'erm', 'yearly_usages', 'yearly_usages', 'json' ) | $raw %]; >+[% MACRO jsinclude BLOCK %] >+ [% INCLUDE 'calendar.inc' %] >+ [% INCLUDE 'datatables.inc' %] >+ [% INCLUDE 'js-patron-format.inc' %] >+ [% INCLUDE 'js-date-format.inc' %] >+ <script> >+ const agreement_table_settings = [% TablesSettings.GetTableSettings( 'erm', 'agreements', 'agreements', 'json' ) | $raw %]; >+ const license_table_settings = [% TablesSettings.GetTableSettings( 'erm', 'licenses', 'licenses', 'json' ) | $raw %]; >+ const eholdings_packages_table_settings = [% TablesSettings.GetTableSettings( 'erm', 'eholdings', 'packages', 'json' ) | $raw %]; >+ const eholdings_titles_table_settings = [% TablesSettings.GetTableSettings( 'erm', 'eholdings', 'titles', 'json' ) | $raw %]; >+ const usage_data_provider_table_settings = [% TablesSettings.GetTableSettings( 'erm', 'usage_data_providers', 'usage_data_providers', 'json' ) | $raw %]; >+ const title_table_settings = [% TablesSettings.GetTableSettings( 'erm', 'titles', 'titles', 'json' ) | $raw %]; >+ const counter_log_table_settings = [% TablesSettings.GetTableSettings( 'erm', 'counter_logs', 'counter_logs', 'json' ) | $raw %]; >+ const monthly_usage_table_settings = [% TablesSettings.GetTableSettings( 'erm', 'monthly_usages', 'monthly_usages', 'json' ) | $raw %]; >+ const yearly_usage_table_settings = [% TablesSettings.GetTableSettings( 'erm', 'yearly_usages', 'yearly_usages', 'json' ) | $raw %]; > >- const max_allowed_packet = [% To.json(max_allowed_packet) | $raw %]; >+ const max_allowed_packet = [% To.json(max_allowed_packet) | $raw %]; > >- const logged_in_user_lists = [% To.json(logged_in_user.virtualshelves.unblessed) | $raw %]; >+ const logged_in_user_lists = [% To.json(logged_in_user.virtualshelves.unblessed) | $raw %]; > >- const logged_in_user = [% To.json(logged_in_user.unblessed) | $raw %]; >- </script> >- [% Asset.js("js/vue/dist/erm.js") | $raw %] >- [% INCLUDE 'select2.inc' %] >- [% SET columns = ['cardnumber','name','category','branch','action'] %] >- [% SET filter = "erm_users" %] >- [% PROCESS patron_search_modal columns => columns, modal_title => t("Select user") %] >- [% PROCESS patron_search_js columns => columns, actions => ["select"], preview_on_name_click => 1 %] >- [% END %] >- [% INCLUDE 'intranet-bottom.inc' %]</div >-> >+ const logged_in_user = [% To.json(logged_in_user.unblessed) | $raw %]; >+ </script> >+ [% Asset.js("js/vue/dist/erm.js") | $raw %] >+ [% INCLUDE 'select2.inc' %] >+ [% SET columns = ['cardnumber','name','category','branch','action'] %] >+ [% SET filter = "erm_users" %] >+ [% PROCESS patron_search_modal columns => columns, modal_title => t("Select user") %] >+ [% PROCESS patron_search_js columns => columns, actions => ["select"], preview_on_name_click => 1 %] >+[% END %] >+[% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/preservation/home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/preservation/home.tt >index 1f2914e7400..0b1c1bb1ae3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/preservation/home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/preservation/home.tt >@@ -17,24 +17,22 @@ > [% INCLUDE 'preservation-search.inc' %] > [% END %] > >-<div id="preservation"> >- <!-- this is closed in intranet-bottom.inc --> >+<div id="preservation"></div> > >- [% MACRO jsinclude BLOCK %] >- [% INCLUDE 'calendar.inc' %] >- [% INCLUDE 'datatables.inc' %] >- [% INCLUDE 'js-patron-format.inc' %] >- [% INCLUDE 'js-date-format.inc' %] >- [% INCLUDE 'js-biblio-format.inc' %] >- <script> >- const authorised_value_categories = [% To.json(AuthorisedValues.GetCategories()) | $raw %].map(c => c.category); >- const db_columns = [% To.json(db_columns) | $raw %]; >- const api_mappings = [% To.json(api_mappings) | $raw %]; >- const notice_templates = [% To.json(notice_templates || []) | $raw %]; >+[% MACRO jsinclude BLOCK %] >+ [% INCLUDE 'calendar.inc' %] >+ [% INCLUDE 'datatables.inc' %] >+ [% INCLUDE 'js-patron-format.inc' %] >+ [% INCLUDE 'js-date-format.inc' %] >+ [% INCLUDE 'js-biblio-format.inc' %] >+ <script> >+ const authorised_value_categories = [% To.json(AuthorisedValues.GetCategories()) | $raw %].map(c => c.category); >+ const db_columns = [% To.json(db_columns) | $raw %]; >+ const api_mappings = [% To.json(api_mappings) | $raw %]; >+ const notice_templates = [% To.json(notice_templates || []) | $raw %]; > >- const csrf_token = "[% Koha.GenerateCSRF | $raw %]"; >- </script> >- [% Asset.js("js/vue/dist/preservation.js") | $raw %] >- [% END %] >- [% INCLUDE 'intranet-bottom.inc' %]</div >-> >+ const csrf_token = "[% Koha.GenerateCSRF | $raw %]"; >+ </script> >+ [% Asset.js("js/vue/dist/preservation.js") | $raw %] >+[% END %] >+[% INCLUDE 'intranet-bottom.inc' %] >-- >2.34.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 39350
:
179379
|
179427
|
180242