@@ -, +, @@
* Guarantor
* Suggestion's manager
* Patron's card
* Serial routing list
* Users to notify when order is received
* Manager of an acquisition basket
* Owner and users of a fund
* Filter a patron set by patrons having a
* Restrict/allow access to the default patron searches /patrons
---
.../prog/en/includes/js-patron-format.inc | 2 +-
.../prog/en/modules/common/patron_search.tt | 312 ---------------
.../prog/en/modules/members/search.tt | 368 ++++++++++++++++++
.../members/tables/guarantor_search.tt | 36 --
koha-tmpl/intranet-tmpl/prog/js/datatables.js | 63 ++-
koha-tmpl/intranet-tmpl/prog/js/members.js | 8 +-
members/{guarantor_search.pl => search.pl} | 22 +-
7 files changed, 433 insertions(+), 378 deletions(-)
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt
rename members/{guarantor_search.pl => search.pl} (69%)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/js-patron-format.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/js-patron-format.inc
@@ -26,7 +26,7 @@
firstname += ' (' + escape_str(patron.other_name) + ')';
}
if ( config && config.invert_name ) {
- name = surname + ', ' + firstname;
+ name = surname + ( firstname ? ', ' + firstname : '' );
}
else {
name = firstname + ' ' + surname;
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt
@@ -1,312 +0,0 @@
-[% USE raw %]
-[% USE Asset %]
-[% USE Koha %]
-[% USE Branches %]
-[% SET footerjs = 1 %]
-[% INCLUDE 'doc-head-open.inc' %]
-
Patron search › Koha
-[% INCLUDE 'doc-head-close.inc' %]
-
-
-
-
-
-
-
-
-
- [% IF patrons_with_acq_perm_only %]
-
Only staff with superlibrarian or acquisitions permissions (or order_manage permission if granular permissions are enabled) are returned in the search results
- [% END %]
-
- [% IF patrons_with_suggestion_perm_only %]
-
Only staff with superlibrarian or suggestions_manage permissions are returned in the search results
- [% END %]
-
-
- Browse by last name:
- [% FOREACH letter IN alphabet.split(' ') %]
- [% letter | html %]
- [% END %]
-
-
-
-
-
-
-
-
-
-
- [% FOR column IN columns %]
- [% SWITCH column %]
- [% CASE 'cardnumber' %]
-
-[% MACRO jsinclude BLOCK %]
- [% INCLUDE 'datatables.inc' %]
-
-
-[% END %]
-
-[% SET popup_window = 1 %]
-[% INCLUDE 'intranet-bottom.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt
@@ -0,0 +1,368 @@
+[% USE raw %]
+[% USE To %]
+[% USE Asset %]
+[% USE Koha %]
+[% USE Branches %]
+[% USE Categories %]
+[% SET footerjs = 1 %]
+[% INCLUDE 'doc-head-open.inc' %]
+[% SET libraries = Branches.all %]
+[% SET categories = Categories.all.unblessed %]
+Patron search › Koha
+[% INCLUDE 'doc-head-close.inc' %]
+
+
+
+
+
+
+
+
+
+ [% IF patrons_with_acq_perm_only %]
+
Only staff with superlibrarian or acquisitions permissions (or order_manage permission if granular permissions are enabled) are returned in the search results
+ [% END %]
+
+ [% IF patrons_with_suggestion_perm_only %]
+
Only staff with superlibrarian or suggestions_manage permissions are returned in the search results
+ [% END %]
+
+
+ Browse by last name:
+ [% FOREACH letter IN alphabet.split(' ') %]
+ [% letter | html %]
+ [% END %]
+
+
+
+
+
+
+
+
+
+
+ [% FOR column IN columns %]
+ [% SWITCH column %]
+ [% CASE 'cardnumber' %]