Bug 15774: (follow-up) fix rebase issues

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
index ad1ebb7..427dd68 100755 (executable)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
@@ -177,7 +177,7 @@
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE "datatables.inc" %]
-    <script type="text/javascript">
+    <script>
         $(document).ready(function(){
             $('#selecttable').find(":submit").hide();
             $('#selecttable select').change(function() {

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
index a672b69..60c0f57 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
@@ -203,15 +203,11 @@
                         <dt><a href="/cgi-bin/koha/admin/usage_statistics.pl">Share your usage statistics</a></dt>
                         <dd>Share with the Koha community the usage statistics of your Koha installation.</dd>
                     [% END %]
-<<<<<<< HEAD
                     [% IF ( CAN_user_parameters_manage_mana ) %]
                         <dt><a href="/cgi-bin/koha/admin/share_content.pl">Share content with Mana KB</a></dt>
                         <dd>Share content (subscriptions, reports) with the Koha community</dd>
                     [% END %]
-                    [% IF ( CAN_user_parameters_manage_additional_fields_baskets || CAN_user_parameters_manage_additional_fields_subscriptions ) %]
-=======
                     [% IF ( CAN_user_parameters_manage_additional_fields ) %]
->>>>>>> Bug 15774: Add permission for managing additional fields
                     <dt><a href="/cgi-bin/koha/admin/additional-fields.pl">Additional fields</a></dt>
                     <dd>Add additional fields to certain tables</dd>
                     [% END %]

diff --git a/serials/serials-search.pl b/serials/serials-search.pl
index b1fa40f..fe9347e 100755 (executable)
--- a/serials/serials-search.pl
+++ b/serials/serials-search.pl
@@ -139,8 +139,8 @@ if ($mana) {
         expiration_date_filter => $expiration_date_dt,
         done_searched => $searched,
         routing       => $routing,
-        additional_field_filters => $additional_field_filters,
-        additional_fields_for_subscription => $additional_fields,
+        additional_field_filters => \@additional_field_filters,
+        additional_fields_for_subscription => \@additional_fields,
         marcflavour   => (uc(C4::Context->preference("marcflavour"))),
         mana => $mana,
         search_only => 1