Attachment #87474 for bug #22649

View | Details | Raw Unified | Return to bug 22649
Collapse All | Expand All

Lines 63-69 if (defined $format and $format eq 'json') { Link Here

(-)a/catalogue/itemsearch.pl (-1 / +1 lines)
63	push @f, $columns[$i];	63	push @f, $columns[$i];
64	push @c, 'and';	64	push @c, 'and';
65		65
66	if ( grep /^$columns[$i]$/, qw( ccode homebranch holdingbranch location notforloan ) ) {	66	if ( grep /^$columns[$i]$/, qw( ccode homebranch holdingbranch location itype notforloan ) ) {
67	push @q, "$word";	67	push @q, "$word";
68	push @op, '=';	68	push @op, '=';
69	} else {	69	} else {

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc (-1 / +2 lines)
1	[%- USE Branches -%]	1	[%- USE Branches -%]
2	[%- USE Koha -%]	2	[%- USE Koha -%]
		3	[%- USE ItemTypes -%]
3	[%- SET biblio = item.biblio -%]	4	[%- SET biblio = item.biblio -%]
4	[%- SET biblioitem = item.biblioitem -%]	5	[%- SET biblioitem = item.biblioitem -%]
5	"[% biblio.title \| html %] [% IF ( Koha.Preference( 'marcflavour' ) == 'UNIMARC' && biblio.author ) %]by [% END %][% biblio.author \| html %]", "[% (biblioitem.publicationyear \|\| biblio.copyrightdate) \| html %]", "[% biblioitem.publishercode \| html %]", "[% biblioitem.collectiontitle \| html %]", "[% item.barcode \| html %]", "[% item.itemcallnumber \| html %]", "[% Branches.GetName(item.homebranch) \| html %]", "[% Branches.GetName(item.holdingbranch) \| html %]", "[% item.location \| html %]", "[% item.stocknumber \| html %]", "[% item.status \| html %]", "[% (item.issues \|\| 0) \| html %]"	6	"[% biblio.title \| html %] [% IF ( Koha.Preference( 'marcflavour' ) == 'UNIMARC' && biblio.author ) %]by [% END %][% biblio.author \| html %]", "[% (biblioitem.publicationyear \|\| biblio.copyrightdate) \| html %]", "[% biblioitem.publishercode \| html %]", "[% biblioitem.collectiontitle \| html %]", "[% item.barcode \| html %]", "[% item.itemcallnumber \| html %]", "[% Branches.GetName(item.homebranch) \| html %]", "[% Branches.GetName(item.holdingbranch) \| html %]", "[% item.location \| html %]", "[% ItemTypes.GetDescription(item.itype) \| html %]", "[% item.stocknumber \| html %]", "[% item.status \| html %]", "[% (item.issues \|\| 0) \| html %]"

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc (+2 lines)
1	[%- USE Branches -%]	1	[%- USE Branches -%]
2	[%- USE Koha -%]	2	[%- USE Koha -%]
		3	[%- USE ItemTypes -%]
3	[% USE AuthorisedValues %]	4	[% USE AuthorisedValues %]
4	[%- biblio = item.biblio -%]	5	[%- biblio = item.biblio -%]
5	[%- biblioitem = item.biblioitem -%]	6	[%- biblioitem = item.biblioitem -%]
Lines 17-22 Link Here
17	"[% Branches.GetName(item.homebranch) \| html %]",	18	"[% Branches.GetName(item.homebranch) \| html %]",
18	"[% Branches.GetName(item.holdingbranch) \| html %]",	19	"[% Branches.GetName(item.holdingbranch) \| html %]",
19	"[% item.location \| html %]",	20	"[% item.location \| html %]",
		21	"[% ItemTypes.GetDescription(item.itype) \| html %]",
20	"[% item.stocknumber \| html %]",	22	"[% item.stocknumber \| html %]",
21	"[% item.status \| html %]",	23	"[% item.status \| html %]",
22	"[% (item.issues \|\| 0) \| html %]",	24	"[% (item.issues \|\| 0) \| html %]",

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/catalogue/itemsearch.tt (-1 / +1 lines)

Line 1 Link Here

[%- BLOCK -%]Title, Publication date, Publisher, Collection, Barcode, Call number, Home library, Current location, Shelving location, Inventory number, Status, Checkouts[%- END -%]

[%- BLOCK -%]Title, Publication date, Publisher, Collection, Barcode, Call number, Home library, Current location, Shelving location, Itemtype, Inventory number, Status, Checkouts[%- END -%]

Lines 269-274 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt (-1 / +7 lines)
269	+ ' <th id="items_homebranch">' + _("Home library") + '</th>'	269	+ ' <th id="items_homebranch">' + _("Home library") + '</th>'
270	+ ' <th id="items_holdingbranch">' + _("Current location") + '</th>'	270	+ ' <th id="items_holdingbranch">' + _("Current location") + '</th>'
271	+ ' <th id="items_location">' + _("Shelving location") + '</th>'	271	+ ' <th id="items_location">' + _("Shelving location") + '</th>'
		272	+ ' <th id="items_itype">' + _("Itemtype") + '</th>'
272	+ ' <th id="item_inventoryno">' + _("Inventory number") + '</th>'	273	+ ' <th id="item_inventoryno">' + _("Inventory number") + '</th>'
273	+ ' <th id="items_status">' + _("Status") + '</th>'	274	+ ' <th id="items_status">' + _("Status") + '</th>'
274	+ ' <th id="items_checkouts">' + _("Checkouts") + '</th>'	275	+ ' <th id="items_checkouts">' + _("Checkouts") + '</th>'
Lines 372-377 Link Here
372	{ 'sName': 'homebranch' },	373	{ 'sName': 'homebranch' },
373	{ 'sName': 'holdingbranch' },	374	{ 'sName': 'holdingbranch' },
374	{ 'sName': 'location' },	375	{ 'sName': 'location' },
		376	{ 'sName': 'itype'},
375	{ 'sName': 'stocknumber' },	377	{ 'sName': 'stocknumber' },
376	{ 'sName': 'notforloan' },	378	{ 'sName': 'notforloan' },
377	{ 'sName': 'issues' },	379	{ 'sName': 'issues' },
Lines 398-403 Link Here
398	[% ELSE %]	400	[% ELSE %]
399	null,	401	null,
400	[% END %]	402	[% END %]
		403	[% IF itemtypes.size %]
		404	{ 'type': 'select', 'values': [% INCLUDE escape_html_value_label elts => itemtypes %] },
		405	[% ELSE %]
		406	null,
		407	[% END %]
401	{ 'type': 'text' },	408	{ 'type': 'text' },
402	[% IF notforloans.size %]	409	[% IF notforloans.size %]
403	{ 'type': 'select', 'values': [% INCLUDE escape_html_value_label elts => notforloans %] },	410	{ 'type': 'select', 'values': [% INCLUDE escape_html_value_label elts => notforloans %] },
404	-

Return to bug 22649