Bugzilla – Attachment 85792 Details for
Bug 15774
Additional fields for baskets
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15774: (follow-up) fix rebase issues
Bug-15774-follow-up-fix-rebase-issues.patch (text/plain), 3.18 KB, created by
Nick Clemens (kidclamp)
on 2019-02-27 18:44:33 UTC
(
hide
)
Description:
Bug 15774: (follow-up) fix rebase issues
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2019-02-27 18:44:33 UTC
Size:
3.18 KB
patch
obsolete
>From 7ee9764bc180f38ee37af6e969f3fd6031a7184e Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Wed, 27 Feb 2019 13:22:31 -0500 >Subject: [PATCH] Bug 15774: (follow-up) fix rebase issues > >--- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt | 4 ---- > serials/serials-search.pl | 4 ++-- > 3 files changed, 3 insertions(+), 7 deletions(-) > >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 ad1ebb718d..427dd681c1 100755 >--- 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 a672b69afa..60c0f572f0 100644 >--- 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 b1fa40f01a..fe9347eb03 100755 >--- 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 >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 15774
:
48224
|
53608
|
53609
|
72078
|
72079
|
72085
|
72086
|
75083
|
75084
|
75085
|
75086
|
75336
|
75354
|
75361
|
79976
|
79977
|
79978
|
79979
|
79980
|
79981
|
79982
|
80060
|
80061
|
80062
|
80063
|
80064
|
80065
|
80066
|
80680
|
81490
|
81491
|
81492
|
81493
|
81494
|
81495
|
81496
|
81497
|
81833
|
81837
|
81838
|
81839
|
81840
|
81841
|
81842
|
81843
|
81844
|
81845
|
81846
|
81847
|
81848
|
81849
|
81850
|
81851
|
81852
|
83349
|
83350
|
83351
|
83352
|
83353
|
83354
|
83355
|
83356
|
83357
|
83358
|
83359
|
83360
|
83361
|
83362
|
83363
|
83364
|
83444
|
83445
|
83446
|
83447
|
83448
|
83449
|
83450
|
83451
|
83452
|
83453
|
83454
|
83455
|
83456
|
83457
|
83458
|
83459
|
85333
|
85334
|
85335
|
85336
|
85337
|
85338
|
85339
|
85340
|
85341
|
85342
|
85343
|
85344
|
85345
|
85346
|
85347
|
85348
|
85792
|
85806
|
85807
|
85808
|
85809
|
85810
|
85811
|
85812
|
85813
|
85814
|
85815
|
85816
|
85817
|
85818
|
85819
|
85820
|
85821
|
85822
|
85823
|
85824
|
86411