Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 15774: (follow-up) fix rebase issues

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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Nick Clemens 2019-02-27 13:22:31 -05:00
parent 9cfcd21f24
commit 1966c6be2e
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
View file

@ -177,7 +177,7 @@
[% MACRO jsinclude BLOCK %] [% MACRO jsinclude BLOCK %]
[% INCLUDE "datatables.inc" %] [% INCLUDE "datatables.inc" %]
<script type="text/javascript"> <script>
$(document).ready(function(){ $(document).ready(function(){
$('#selecttable').find(":submit").hide(); $('#selecttable').find(":submit").hide();
$('#selecttable select').change(function() { $('#selecttable select').change(function() {

4
koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
View file

@ -203,15 +203,11 @@
<dt><a href="/cgi-bin/koha/admin/usage_statistics.pl">Share your usage statistics</a></dt> <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> <dd>Share with the Koha community the usage statistics of your Koha installation.</dd>
[% END %] [% END %]
<<<<<<< HEAD
[% IF ( CAN_user_parameters_manage_mana ) %] [% IF ( CAN_user_parameters_manage_mana ) %]
<dt><a href="/cgi-bin/koha/admin/share_content.pl">Share content with Mana KB</a></dt> <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> <dd>Share content (subscriptions, reports) with the Koha community</dd>
[% END %] [% END %]
[% IF ( CAN_user_parameters_manage_additional_fields_baskets || CAN_user_parameters_manage_additional_fields_subscriptions ) %]
=======
[% IF ( CAN_user_parameters_manage_additional_fields ) %] [% 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> <dt><a href="/cgi-bin/koha/admin/additional-fields.pl">Additional fields</a></dt>
<dd>Add additional fields to certain tables</dd> <dd>Add additional fields to certain tables</dd>
[% END %] [% END %]

4
serials/serials-search.pl
View file

@ -139,8 +139,8 @@ if ($mana) {
expiration_date_filter => $expiration_date_dt, expiration_date_filter => $expiration_date_dt,
done_searched => $searched, done_searched => $searched,
routing => $routing, routing => $routing,
additional_field_filters => $additional_field_filters, additional_field_filters => \@additional_field_filters,
additional_fields_for_subscription => $additional_fields, additional_fields_for_subscription => \@additional_fields,
marcflavour => (uc(C4::Context->preference("marcflavour"))), marcflavour => (uc(C4::Context->preference("marcflavour"))),
mana => $mana, mana => $mana,
search_only => 1 search_only => 1