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

Bug 28821: (follow-up) Improve operation of button plus/less 

Follow-up for bug 28784.

Do not remove the op select on the first row.
Allow plus/less on all lines. Allow less until we have one line left.
Make sure that first op is disabled and hidden with plus/less.

Test plan:
Search on multiple indexes on advanced search.
Verify that plus/minus works as expected.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Marcel de Rooy 2021-08-06 07:28:12 +00:00 committed by Jonathan Druart
parent 83c3b10a8a
commit 2047cd98db
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
View File

@ -40,13 +40,11 @@
<div class="search-term-row">
<div class="search-term-input">
[% IF ( expanded_options ) %]
[% IF ( !loop.first ) %]
<select name="op" class="form-control">
<option value="and" selected="selected">and</option>
<option value="or">or</option>
<option value="not">not</option>
</select>
[% END %]
[% ELSE %]
<label for="search-field_[% loop.index | html %]">
[% IF loop.index == 0 %]
@ -118,14 +116,12 @@
</div> <!-- .search-term-input -->
[% IF ( expanded_options ) %]
<div class="search-term-input">
[% IF ( !loop.first ) %]
<a class="ButtonPlus" title="Add another field" href="#">
<i class="fa fa-plus-square" aria-hidden="true"></i>
</a>
<a class="ButtonLess" title="Remove field" href="#">
<i class="fa fa-minus-square" aria-hidden="true"></i>
</a>
[% END %]
</div> <!-- .search-term-input -->
[% END %]
</div> <!-- /.search-term-row -->
@ -477,7 +473,8 @@ $(document).ready(function() {
$('#advsearches').tabs();
jQuery.cookie.json = true;
//$('#advsearches > ul').tabs();
$('.search-term-row .search-term-input select[name="op"]').first().prop("disabled",true).hide();
[% IF ( ReturnToSearch ) %]
if (form_serialized = jQuery.cookie("form_serialized")) {
@ -540,16 +537,18 @@ $(document).ready(function() {
$('.ButtonLess').show();
var thisLine = $(this).parent().parent();
var newLine = thisLine.clone();
$(newLine).find('.search-term-input select[name="op"]').first().prop("disabled",false).show();
newLine.find('input').val('');
thisLine.after(newLine);
});
$(document).on("click", '.ButtonLess', function(e) {
e.preventDefault();
if($(this).parent().parent().siblings().length <= 3 ) {
if($(this).parent().parent().siblings().length < 2 ) {
$('.ButtonLess').hide();
}
$(this).parent().parent().remove();
$('.search-term-row .search-term-input select[name="op"]').first().prop("disabled",true).hide();
});
</script>