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

Bug 42291: (follow-up) Move remaining JS to non TT script block 

This removes all TT interpolations from the build_dropdown function and moves it to the non TT script block.

To test:
a) create several private or public lists via /cgi-bin/koha/virtualshelves/shelves.pl
b) either the number of private or public list should be > 10 to
c) add some items to a list
d) on this lists content site click 'Add to' to open drop down menu
e) the menu should offer up to 10 private or 10 public list options and a [ more lists ] option

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Pedro Amorim <pedro.amorim@openfifth.co.uk>
This commit is contained in:
Jan Kissig 2026-06-08 20:53:23 +00:00 committed by Pedro Amorim
parent 56036ac098
commit d194215dfe
No known key found for this signature in database
GPG Key ID: 06B75BA7F3894D55
1 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
View File

@ -2,6 +2,7 @@
[% USE AdditionalContents %]
[% USE Asset %]
[% USE Koha %]
[% USE To %]
[% USE KohaDates %]
[% USE AuthorisedValues %]
[% USE Branches %]
@ -681,44 +682,8 @@
[% END %]
[% IF shelf AND op == 'view' %]
function build_dropdown(){
var param1 = "| <label for=\"addto\">"+_("Add to:")+"<\/label><select name=\"addto\" id=\"addto\"><option value=\"\"><\/option>";
if (Koha.prefs.intranetbookbag){
param1 += "<option value=\"addtocart\">"+_("Cart")+"<\/option>";
}
if (Koha.prefs.virtualshelves){
[% IF add_to_some_private_shelves.count %]
param1 += "<optgroup label=\""+_("Your lists:")+"\">";
[% SET number_of_private_shelves = 0 %]
[% FOREACH s IN add_to_some_private_shelves %]
[% IF shelfnumber != s.shelfnumber %]
param1 += "<option id=\"s[% s.shelfnumber | html %]\" value=\"addtolist\">[% s.shelfname | html %]<\/option>";
[% SET number_of_private_shelves = number_of_private_shelves + 1 %]
[% IF number_of_private_shelves == 10 %][% LAST %][% END %]
[% END %]
[% END %]
param1 += "<\/optgroup>";
[% END %]
[% IF add_to_some_public_shelves.count %]
param1 += "<optgroup label=\""+_("Public lists:")+"\">";
[% SET number_of_public_shelves = 0 %]
[% FOREACH s IN add_to_some_public_shelves %]
[% IF shelfnumber != s.shelfnumber %]
param1 += "<option id=\"s[% s.shelfnumber | html %]\" value=\"addtolist\">[% s.shelfname | html %]<\/option>";
[% SET number_of_public_shelves = number_of_public_shelves + 1 %]
[% IF number_of_public_shelves == 10 %][% LAST %][% END %]
[% END %]
[% END %]
param1 += "<\/optgroup>";
[% END %]
[% IF add_to_some_private_shelves.count > 10 or add_to_some_public_shelves.count > 10 %]
param1 += "<option value=\"morelists\">[ "+_("More lists")+" ]<\/option>";
[% END %]
param1 +="<option value=\"newlist\">"+_("[ New list ]")+"<\/option>"
}
param1 += "<\/select> <button id=\"cartsubmit\" type=\"submit\" class=\"btn btn-default btn-xs\">"+_("Save")+"</button>";
return param1;
}
const add_to_some_private_shelves = [% To.json(add_to_some_private_shelves.unblessed || []) | $raw %];
const add_to_some_public_shelves = [% To.json(add_to_some_public_shelves.unblessed || []) | $raw %];
[% END %]
</script>
[% IF print %]
@ -864,6 +829,46 @@
$("#barcodes").focus();
});
});
function build_dropdown() {
var param1 = '| <label for="addto">' + _("Add to:") + '<\/label> <select name="addto" id="addto"><option value=""><\/option>';
if (Koha.prefs.intranetbookbag) {
param1 += '<option value="addtocart">' + _("Cart") + "<\/option>";
}
if (Koha.prefs.virtualshelves) {
if (add_to_some_private_shelves.length) {
param1 += '<optgroup label="' + _("Your lists:") + '">';
let number_of_private_shelves = 0;
for (let s of add_to_some_private_shelves) {
if (shelfnumber != s.shelfnumber) {
param1 += `<option id=\"s${s.shelfnumber}\" value=\"addtolist\">${escape_str(s.shelfname)}<\/option>`;
number_of_private_shelves++;
if (number_of_private_shelves == 10) break;
}
}
param1 += "<\/optgroup>";
}
if (add_to_some_public_shelves.length) {
param1 += '<optgroup label="' + _("Public lists:") + '">';
let number_of_public_shelves = 0;
for (let s of add_to_some_public_shelves) {
if (shelfnumber != s.shelfnumber) {
param1 += `<option id=\"s${s.shelfnumber}\" value=\"addtolist\">${escape_str(s.shelfname)}<\/option>`;
number_of_public_shelves++;
if (number_of_public_shelves == 10) break;
}
}
param1 += "<\/optgroup>";
}
if (add_to_some_private_shelves.length > 10 || add_to_some_public_shelves.length > 10) {
param1 += '<option value="morelists">[ ' + _("More lists") + " ]<\/option>";
}
param1 += '<option value="newlist">' + _("[ New list ]") + "<\/option>";
}
param1 += '<\/select> <button id="cartsubmit" type="submit" class="btn btn-default btn-xs">' + _("Save") + "</button>";
return param1;
}
</script>
[% END # /IF shelf AND op == 'view' %]