@@ -, +, @@
- Serials search should work correctly and the page should look correct.
- With Mana enabled, click on the "Search on Mana" link in the sidebar.
- Searches of Mana should work correctly too.
- If you view the diff while ignoring whitespace the only changes should
be the move of
and places where line breaks were introduced.
---
.../prog/en/modules/serials/serials-search.tt | 783 +++++++++++----------
1 file changed, 395 insertions(+), 388 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
@@ -13,415 +13,422 @@
-[% INCLUDE 'header.inc' %]
-[% INCLUDE 'serials-search.inc' %]
-
-
- [% IF closed %]
- [% SET tab = 'closed' %]
- [% ELSE %]
- [% SET tab = 'opened' %]
+ [% url_params = [] %]
+ [% FOREACH param IN CGI.params.pairs %]
+ [% escaped_value = BLOCK %][% param.value | uri %][% END %]
+ [% url_params.push(param.key _ '=' _ escaped_value) %]
[% END %]
- [% IF CAN_user_serials_edit_subscription %]
-
[% IF ( subscription.publicnotes ) %][% subscription.publicnotes | html %][% END %]
- [% IF ( subscription.internalnotes ) %]([% subscription.internalnotes | html %])[% END %]
-
-
- [% IF ( subscription.branchcode ) %][% Branches.GetName( subscription.branchcode ) | html %][% END %]
-
-
- [% IF ( subscription.location ) %][% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => subscription.location ) | html %][% END %]
-
-
- [% IF ( subscription.callnumber ) %][% subscription.callnumber | html %][% END %]
-
- [% UNLESS closed %]
-
- [% subscription.enddate | $KohaDates %]
-
- [% END %]
- [% FOR field IN additional_fields_for_subscription %]
- [% IF field.authorised_value_category %]
-
[% AuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) | html %]
- [% ELSE %]
-
[% subscription.additional_fields.${field.name} | html %]
- [% END %]
+ [% SET referrer = '/cgi-bin/koha/serials/serials-search.pl?' %]
+ [% referrer = BLOCK %][% referrer | url %][% url_params.join("&") |uri %][% END %]
+ [% SET edit_action_link = '/cgi-bin/koha/serials/subscription-batchedit.pl?referrer=' _ referrer %]
+
+ [% BLOCK subscriptions_table %]
+
+ [% END %]
+
+
+
+
+
+
+ [% INCLUDE 'serials-toolbar.inc' %]
-
+ [% IF ( done_searched ) %]
+
Serials subscriptions ([% total | html %] found)
[% ELSE %]
-
- [% IF ( CAN_user_serials_receive_serials ) %]
- [%# There should be no space between these two buttons, it would render badly %]
- Serial receive
- [% ELSE %]
- Actions
- [% END %]
-
-
- [% IF ( routing && CAN_user_serials_routing ) %]
- [% IF ( subscription.cannotedit ) %]
- [% ELSE %]
- [% IF ( subscription.routingedit ) %]
+
Serials subscriptions search
+ [% END %]
+
+ [% UNLESS ( done_searched ) %]
+
+
[% END %]
-
-
-
-
- [% END %]
- [% END %]
-
-
-
-[% END %]
-
-
-
-
-
-
- [% INCLUDE 'serials-toolbar.inc' %]
-
- [% IF ( done_searched ) %]
-
Serials subscriptions ([% total | html %] found)
- [% ELSE %]
-
Serials subscriptions search
- [% END %]
-
- [% UNLESS ( done_searched ) %]
-
-
-
- [% END %]
- [% IF ( done_searched ) %]
- [% IF ( total ) %]
-