gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 41604: Use visibility_condition in other places 

There are 3 other places where we force the visibility of columns. They
must als use this new visibility_condition flag, so they are all using
it.

Test plan:
The 3 tables are:
1. basket with the columns edifact, modify, cancel
2. hold history with the column itemtype
3. batch edit patron with the columns checkbox, password expiration,
   protected

Signed-off-by: Jason Robb <jrobb@sekls.org>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Jason Robb <jrobb@sekls.org>
Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
Jonathan Druart 2026-03-06 11:51:29 +01:00 committed by Lucas Gass
parent a5b5bf623a
commit f3ff091165
No known key found for this signature in database
GPG Key ID: 60B447398B0D36CA
3 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
View File

@ -1450,28 +1450,18 @@
<script nonce="[% Koha.CSPNonce | $raw %]">
var orders_table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders', 'json' ) | $raw %];
let supplier_report_column = orders_table_settings.columns.find(c => c.columnname == 'supplier_report');
[% IF !(Koha.Preference('EDIFACT') && ediaccount) %]
supplier_report_column.is_hidden = 1;
supplier_report_column.cannot_be_toggled = 1;
[% ELSE %]
supplier_report_column.is_hidden = 0;
[% END %]
const editfact_available = [% Koha.Preference('EDIFACT') && ediaccount ? 1 : 0 | html %];
supplier_report_column.visibility_condition = edifact_available;
supplier_report_column.force_visibility = 1;
let modify_column = orders_table_settings.columns.find(c => c.columnname == 'modify');
[% IF ( active && !closedate ) %]
modify_column.is_hidden = 0;
[% ELSE %]
modify_column.is_hidden = 1;
[% END %]
const modify_column_available = [% active && !closedate ? 1 : 0 | html %];
modify_column.visibility_condition = modify_column_available;
modify_column.force_visibility = 1;
let cancel_column = orders_table_settings.columns.find(c => c.columnname == 'cancel');
[% IF !closedate || Koha.Preference('CancelOrdersInClosedBaskets') %]
cancel_column.is_hidden = 0;
[% ELSE %]
cancel_column.is_hidden = 1;
[% END %]
const cancel_column_available = [% !closedate || Koha.Preference('CancelOrdersInClosedBaskets') ? 1 : 0 %]
cancel_column.visibility_condition = cancel_column_available;
cancel_column.force_visibility = 1;
let skip_confirm_reopen = [% skip_confirm_reopen ? 1 : 0 | html %];

10
koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt
View File

@ -190,14 +190,10 @@
</script>
<script nonce="[% Koha.CSPNonce | $raw %]">
$(document).ready(function () {
let item_type_column = table_settings.columns.find(c => c.columnname == "itemtype");
if (!show_itemtype_column) {
item_type_column.is_hidden = 1;
item_type_column.cannot_be_toggled = 1;
} else {
item_type_column.is_hidden = 0;
}
let item_type_column = table_settings.columns.find(c => c.columnname == 'itemtype');
item_type_column.force_visibility = 1;
item_type_column.visibility_condition = show_itemtype_column;
let current_holds_table = build_holds_table("#table_holdshistory");
let old_holds_table = build_holds_table("#table_oldholdshistory", 1);

14
koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
View File

@ -517,28 +517,22 @@
$(document).ready(function () {
if (has_patrons) {
let selections_column = table_settings.columns.find(c => c.columnname == "batch_patron_edit_selections");
const selections_column_available = op == "show";
selections_column.cannot_be_modified = 1;
selections_column.cannot_be_toggled = 1;
selections_column.visibility_condition = selections_column_available;
selections_column.force_visibility = 1;
if (op == "show") {
selections_column.is_hidden = 0;
} else {
selections_column.is_hidden = 1;
}
if (!Koha.permissions.CanUpdatePasswordExpiration) {
let password_expiration_date_column = table_settings.columns.find(c => c.columnname == "batch_patron_edit_password_expiration_date");
password_expiration_date_column.is_hidden = 1;
password_expiration_date_column.cannot_be_modified = 1;
password_expiration_date_column.cannot_be_toggled = 1;
password_expiration_date_column.visibility_condition = 0;
password_expiration_date_column.force_visibility = 1;
}
if (!Koha.permissions.CanUpdateProtectPatron) {
let protected_column = table_settings.columns.find(c => c.columnname == "batch_patron_edit_protected");
protected_column.is_hidden = 1;
protected_column.cannot_be_modified = 1;
protected_column.cannot_be_toggled = 1;
protected_column.visibility_condition = 0;
protected_column.force_visibility = 1;
}