857547c992
When cataloging a field defined with a thesaurus, an authority search
popup is displayed with a search from. Once operators, values and sort
selected in this form the search can be performed. The bug is that the
values entered are kept but not the selected operators and sort.
The same bug was existing in authorities module, solved by Bug 8692.
This patch corrects the bug.
Also uses in 'sort by' options the same text as search in authorities
module : Heading A-Z (default), Heading Z-A, None.
Also removes duplicated code in auth_finder.pl :
value_mainstr => $query->param('value_mainstr') || "", ...
Test plan :
- Create a new biblio with a framework containing a field linked to a
thesaurus. For example : 600
- Click on small icon of main entry. For example : 600$a
=> You get a search form with all operators to "contains" and sort by
"Heading A-Z"
- Enter a value in each text box and perform search
=> You get a search form with values in text boxes and all operators
to "contains"
- Select "starts with" in all operator comboboxes and perform search
=> You get a search form with all operators to "starts with"
- Select "is exactly" in all operator comboboxes and perform search
=> You get a search form with all operators to "is exactly"
- Select "Heading Z-A" in sort by and perform search
=> You get a search form with "Heading Z-A" in sort by
- Select "None" in sort by and perform search
=> You get a search form with "None" in sort by
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: With both patches applied no koha-qa errors
Test
1) Original behavior is whatever selection you do before patch,
search form returns to default options
2) After patch, selection remains
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass, further comments on second patch.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
269 lines
12 KiB
HTML
269 lines
12 KiB
HTML
[% PROCESS 'form-blocks.inc' %]
|
|
<script type="text/javascript">
|
|
//<![CDATA[
|
|
|
|
$(document).ready(function(){
|
|
$("#clear").on("click",function(e){
|
|
e.preventDefault();
|
|
finderjumpfull('blinddetail-biblio-search.pl?authid=0&index=[% index %]');
|
|
});
|
|
$("#createnew").on("click",function(e){
|
|
e.preventDefault();
|
|
finderjumpfull('authorities.pl?index=[% index %]&authtypecode=[% authtypecode %]');
|
|
});
|
|
// marclist
|
|
$( "#value_any" ).autocomplete({
|
|
source: function(request, response) {
|
|
$.ajax({
|
|
url: "/cgi-bin/koha/authorities/ysearch.pl",
|
|
dataType: "json",
|
|
data: {
|
|
authtypecode : "[% authtypecode %]",
|
|
term: request.term,
|
|
op: "do_search",
|
|
type: "intranet",
|
|
and_or: "and",
|
|
operator: "contains",
|
|
orderby: "HeadingAsc",
|
|
querytype: "marclist"
|
|
},
|
|
success: function(data) {
|
|
response( $.map( data, function( item ) {
|
|
return {
|
|
label: item.summary,
|
|
value: item.summary
|
|
}
|
|
}));
|
|
}
|
|
});
|
|
},
|
|
minLength: 3,
|
|
});
|
|
// mainentry
|
|
$( "#value_main" ).autocomplete({
|
|
source: function(request, response) {
|
|
$.ajax({
|
|
url: "/cgi-bin/koha/authorities/ysearch.pl",
|
|
dataType: "json",
|
|
data: {
|
|
authtypecode : "[% authtypecode %]",
|
|
term: request.term,
|
|
op: "do_search",
|
|
type: "intranet",
|
|
and_or: "and",
|
|
operator: "contains",
|
|
orderby: "HeadingAsc",
|
|
querytype: "mainentry"
|
|
},
|
|
success: function(data) {
|
|
response( $.map( data, function( item ) {
|
|
return {
|
|
label: item.summary,
|
|
value: item.summary
|
|
}
|
|
}));
|
|
}
|
|
});
|
|
},
|
|
minLength: 3,
|
|
});
|
|
// mainmainentry
|
|
$( "#value_mainstr" ).autocomplete({
|
|
source: function(request, response) {
|
|
$.ajax({
|
|
url: "/cgi-bin/koha/authorities/ysearch.pl",
|
|
dataType: "json",
|
|
data: {
|
|
authtypecode : "[% authtypecode %]",
|
|
term: request.term,
|
|
op: "do_search",
|
|
type: "intranet",
|
|
and_or: "and",
|
|
operator: "contains",
|
|
orderby: "HeadingAsc",
|
|
querytype: "mainmainentry"
|
|
},
|
|
success: function(data) {
|
|
response( $.map( data, function( item ) {
|
|
return {
|
|
label: item.summary,
|
|
value: item.summary
|
|
}
|
|
}));
|
|
}
|
|
});
|
|
},
|
|
minLength: 3,
|
|
});
|
|
});
|
|
|
|
function finderjumpfull(page)
|
|
{
|
|
window.open(page,'','fullscreen,scrollbars');
|
|
}
|
|
|
|
//]]>
|
|
</script>
|
|
|
|
<div id="toolbar" class="btn-toolbar">
|
|
<div class="btn-group"><a href="#" id="clear" class="btn btn-small"><i class="icon-remove-sign"></i> Clear field</a></div>
|
|
<div class="btn-group"><a href="#" id="createnew" class="btn btn-small"><i class="icon-plus"></i> Create new authority</a></div>
|
|
</div>
|
|
<form name="f" method="get" action="auth_finder.pl">
|
|
<input type="hidden" name="source" value="[% source %]" />
|
|
<input type="hidden" name="op" value="do_search" />
|
|
<input type="hidden" name="type" value="intranet" />
|
|
<input type="hidden" name="index" value="[% index %]" />
|
|
<fieldset class="rows"><legend>Search options</legend>
|
|
<ol><li>
|
|
<span class="label">Authority type: </span>
|
|
[% authtypecode %]
|
|
<input type="hidden" name="authtypecode" value="[% authtypecode %]" />
|
|
</li>
|
|
<li>
|
|
<label for="mainmainentry">Main entry ($a only): </label>
|
|
<input type="hidden" name="marclist" value="mainmainentry" />
|
|
<input type="hidden" name="and_or" value="and" />
|
|
<input type="hidden" name="excluding" value="" />
|
|
<select name="operator" id="mainmainentry">
|
|
[% IF ( operator_mainstr == 'contains' ) %]
|
|
<option value="contains" selected="selected">contains</option>
|
|
[% ELSE %]
|
|
<option value="contains">contains</option>
|
|
[% END %]
|
|
[% IF ( operator_mainstr == 'start' ) %]
|
|
<option value="start" selected="selected">starts with</option>
|
|
[% ELSE %]
|
|
<option value="start">starts with</option>
|
|
[% END %]
|
|
[% IF ( operator_mainstr == 'is' ) %]
|
|
<option value="is" selected="selected">is exactly</option>
|
|
[% ELSE %]
|
|
<option value="is">is exactly</option>
|
|
[% END %]
|
|
</select>
|
|
<input id="value_mainstr" style="width:400px;" type="text" name="value_mainstr" value="[% value_mainstr |html %]" />
|
|
<div id="yvaluecontainermainmainentry"></div>
|
|
</li>
|
|
|
|
<li>
|
|
<label for="mainentry">Main entry: </label>
|
|
<input type="hidden" name="marclist" value="mainentry" />
|
|
<input type="hidden" name="and_or" value="and" />
|
|
<input type="hidden" name="excluding" value="" />
|
|
<select name="operator" id="mainentry">
|
|
[% IF ( operator_main == 'contains' ) %]
|
|
<option value="contains" selected="selected">contains</option>
|
|
[% ELSE %]
|
|
<option value="contains">contains</option>
|
|
[% END %]
|
|
[% IF ( operator_main == 'start' ) %]
|
|
<option value="start" selected="selected">starts with</option>
|
|
[% ELSE %]
|
|
<option value="start">starts with</option>
|
|
[% END %]
|
|
[% IF ( operator_main == 'is' ) %]
|
|
<option value="is" selected="selected">is exactly</option>
|
|
[% ELSE %]
|
|
<option value="is">is exactly</option>
|
|
[% END %]
|
|
</select>
|
|
<input id="value_main" style="width:400px;" type="text" name="value_main" value="[% value_main |html %]" />
|
|
<div id="yvaluecontainermainentry"></div>
|
|
</li>
|
|
|
|
<li>
|
|
<label for="marclistanywhere">Anywhere: </label>
|
|
<input type="hidden" name="marclist" value="any" />
|
|
<input type="hidden" name="and_or" value="and" />
|
|
<input type="hidden" name="excluding" value="" />
|
|
<select name="operator" id="marclistanywhere">
|
|
[% IF ( operator_any == 'contains' ) %]
|
|
<option value="contains" selected="selected">contains</option>
|
|
[% ELSE %]
|
|
<option value="contains">contains</option>
|
|
[% END %]
|
|
[% IF ( operator_any == 'start' ) %]
|
|
<option value="start" selected="selected">starts with</option>
|
|
[% ELSE %]
|
|
<option value="start">starts with</option>
|
|
[% END %]
|
|
[% IF ( operator_any == 'is' ) %]
|
|
<option value="is" selected="selected">is exactly</option>
|
|
[% ELSE %]
|
|
<option value="is">is exactly</option>
|
|
[% END %]
|
|
</select>
|
|
<input id="value_any" style="width:400px;" type="text" name="value_any" value="[% value_any |html %]" />
|
|
<div id="yvaluecontainermarclist"></div>
|
|
</li>
|
|
<li>
|
|
<label for="marclistheading">Heading match: </label>
|
|
<input type="hidden" name="marclist" value="match" />
|
|
<input type="hidden" name="and_or" value="and" />
|
|
<input type="hidden" name="excluding" value="" />
|
|
<select name="operator" id="marclistheading">
|
|
[% IF ( operator_match == 'contains' ) %]
|
|
<option value="contains" selected="selected">contains</option>
|
|
[% ELSE %]
|
|
<option value="contains">contains</option>
|
|
[% END %]
|
|
[% IF ( operator_match == 'start' ) %]
|
|
<option value="start" selected="selected">starts with</option>
|
|
[% ELSE %]
|
|
<option value="start">starts with</option>
|
|
[% END %]
|
|
[% IF ( operator_match == 'is' ) %]
|
|
<option value="is" selected="selected">is exactly</option>
|
|
[% ELSE %]
|
|
<option value="is">is exactly</option>
|
|
[% END %]
|
|
</select>
|
|
<input type="text" name="value_match" value="[% value_match |html %]" />
|
|
</li>
|
|
<li>
|
|
<label for="orderby">Sort by: </label>
|
|
<select name="orderby" id="orderby">
|
|
[% IF ( orderby == 'HeadingAsc' ) %]
|
|
<option value="HeadingAsc" selected="selected">Heading A-Z</option>
|
|
[% ELSE %]
|
|
<option value="HeadingAsc">Heading A-Z</option>
|
|
[% END %]
|
|
[% IF ( orderby == 'HeadingDsc' ) %]
|
|
<option value="HeadingDsc" selected="selected">Heading Z-A</option>
|
|
[% ELSE %]
|
|
<option value="HeadingDsc">Heading Z-A</option>
|
|
[% END %]
|
|
[% IF ( orderby == '' && op ) %]
|
|
<option value="" selected="selected">None</option>
|
|
[% ELSE %]
|
|
<option value="">None</option>
|
|
[% END %]
|
|
</select>
|
|
</li></ol></fieldset>
|
|
[% IF source == 'auth' %]
|
|
<fieldset class="rows"><legend>Relationship information</legend>
|
|
<ol>
|
|
<li>
|
|
<label for="relationship">Special relationship: </label>
|
|
<select name="relationship" id="relationship">
|
|
[% selected=relationship %]
|
|
[% PROCESS selectoptionopen value='' %]None specified</option>
|
|
[% PROCESS selectoptionopen value='a' %]a - Earlier heading</option>
|
|
[% PROCESS selectoptionopen value='b' %]b - Later heading</option>
|
|
[% PROCESS selectoptionopen value='d' %]d - Acronym</option>
|
|
[% PROCESS selectoptionopen value='f' %]f - Musical composition</option>
|
|
[% PROCESS selectoptionopen value='g' %]g - Broader term</option>
|
|
[% PROCESS selectoptionopen value='h' %]h - Narrower term</option>
|
|
[% PROCESS selectoptionopen value='i' %]i - Reference instruction phrase in subfield $i</option>
|
|
[% PROCESS selectoptionopen value='n' %]n - Not applicable</option>
|
|
[% PROCESS selectoptionopen value='r' %]r - Relationship designation in $i or $4</option>
|
|
[% PROCESS selectoptionopen value='t' %]t - Immediate parent body</option>
|
|
</select>
|
|
</li>
|
|
</ol>
|
|
</fieldset>
|
|
[% END %]
|
|
<fieldset class="action"> <input type="submit" value="Search" class="submit" id="search" /> <a id="cancel" class="cancel close" href="#">Cancel</a>
|
|
</fieldset>
|
|
</form>
|