@@ -, +, @@
Serial recipients
---
admin/add_user_search.pl | 2 +-
.../prog/en/modules/common/patron_search.tt | 27 ++-
.../prog/en/modules/serials/member-search.tt | 83 ---------
.../prog/en/modules/serials/routing.tt | 78 +++++----
.../en/modules/serials/tables/members_results.tt | 20 +++
serials/add_user_search.pl | 51 ++++++
serials/member-search.pl | 178 --------------------
7 files changed, 136 insertions(+), 303 deletions(-)
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/serials/tables/members_results.tt
create mode 100755 serials/add_user_search.pl
delete mode 100755 serials/member-search.pl
--- a/admin/add_user_search.pl
+++ a/admin/add_user_search.pl
@@ -43,7 +43,7 @@ my $selection_type = $input->param('selection_type') || 'add';
my $referer = $input->referer();
-# If this script is called by acqui/basket.pl
+# If this script is called by admin/aqbudgets.pl
# the patrons to return should be superlibrarian or have the order_manage
# acquisition flag.
my $search_patrons_with_acq_perm_only =
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt
@@ -114,18 +114,27 @@ function filter() {
// modify parent window owner element
[% IF selection_type == 'add' %]
- [%# Note that add_user could sent data instead of borrowername too %]
function add_user(borrowernumber, borrowername) {
var p = window.opener;
- $("#info").hide();
- $("#error").hide();
- if ( p.add_user(borrowernumber, borrowername) < 0 ) {
- $("#error").html(_("Borrower '%s' is already in the list.").format(borrowername));
- $("#error").show();
- } else {
- $("#info").html(_("Borrower '%s' added.").format(borrowername));
- $("#info").show();
+ // In one place (serials/routing.tt), the page is reload on every add
+ // We have to wait for the page to be there
+ function wait_for_opener () {
+ if ( ! $(opener.document).find('body').size() ) {
+ setTimeout(wait_for_opener, 500);
+ } else {
+ [%# Note that add_user could sent data instead of borrowername too %]
+ $("#info").hide();
+ $("#error").hide();
+ if ( p.add_user(borrowernumber, borrowername) < 0 ) {
+ $("#error").html(_("Borrower '%s' is already in the list.").format(borrowername));
+ $("#error").show();
+ } else {
+ $("#info").html(_("Borrower '%s' added.").format(borrowername));
+ $("#info").show();
+ }
+ }
}
+ wait_for_opener();
}
[% ELSIF selection_type == 'select' %]
function select_user(borrowernumber, data) {
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tt
@@ -1,83 +0,0 @@
-[% INCLUDE 'doc-head-open.inc' %]
-
Koha › Member Search › [% bookselname %]
-[% INCLUDE 'doc-head-close.inc' %]
-
-
-
-
-
-
-
-
-
-
-
-[% IF ( resultsloop ) %]
-
Results [% from %] to [% to %] of [% numresults %] found for [% IF ( member ) %]'[% member %]'[% END %][% IF ( surname ) %]'[% surname %]'[% END %]
-
-
-
-
-
-
Card
-
Name
-
Library
-
Add
-
-
-
- [% FOREACH resultsloo IN resultsloop %]
- [% IF ( loop.odd ) %]