View | Details | Raw Unified | Return to bug 15774
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt (-1 / +1 lines)
Lines 177-183 Link Here
177
177
178
[% MACRO jsinclude BLOCK %]
178
[% MACRO jsinclude BLOCK %]
179
    [% INCLUDE "datatables.inc" %]
179
    [% INCLUDE "datatables.inc" %]
180
    <script type="text/javascript">
180
    <script>
181
        $(document).ready(function(){
181
        $(document).ready(function(){
182
            $('#selecttable').find(":submit").hide();
182
            $('#selecttable').find(":submit").hide();
183
            $('#selecttable select').change(function() {
183
            $('#selecttable select').change(function() {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt (-4 lines)
Lines 203-217 Link Here
203
                        <dt><a href="/cgi-bin/koha/admin/usage_statistics.pl">Share your usage statistics</a></dt>
203
                        <dt><a href="/cgi-bin/koha/admin/usage_statistics.pl">Share your usage statistics</a></dt>
204
                        <dd>Share with the Koha community the usage statistics of your Koha installation.</dd>
204
                        <dd>Share with the Koha community the usage statistics of your Koha installation.</dd>
205
                    [% END %]
205
                    [% END %]
206
<<<<<<< HEAD
207
                    [% IF ( CAN_user_parameters_manage_mana ) %]
206
                    [% IF ( CAN_user_parameters_manage_mana ) %]
208
                        <dt><a href="/cgi-bin/koha/admin/share_content.pl">Share content with Mana KB</a></dt>
207
                        <dt><a href="/cgi-bin/koha/admin/share_content.pl">Share content with Mana KB</a></dt>
209
                        <dd>Share content (subscriptions, reports) with the Koha community</dd>
208
                        <dd>Share content (subscriptions, reports) with the Koha community</dd>
210
                    [% END %]
209
                    [% END %]
211
                    [% IF ( CAN_user_parameters_manage_additional_fields_baskets || CAN_user_parameters_manage_additional_fields_subscriptions ) %]
212
=======
213
                    [% IF ( CAN_user_parameters_manage_additional_fields ) %]
210
                    [% IF ( CAN_user_parameters_manage_additional_fields ) %]
214
>>>>>>> Bug 15774: Add permission for managing additional fields
215
                    <dt><a href="/cgi-bin/koha/admin/additional-fields.pl">Additional fields</a></dt>
211
                    <dt><a href="/cgi-bin/koha/admin/additional-fields.pl">Additional fields</a></dt>
216
                    <dd>Add additional fields to certain tables</dd>
212
                    <dd>Add additional fields to certain tables</dd>
217
                    [% END %]
213
                    [% END %]
(-)a/serials/serials-search.pl (-3 / +2 lines)
Lines 139-146 if ($mana) { Link Here
139
        expiration_date_filter => $expiration_date_dt,
139
        expiration_date_filter => $expiration_date_dt,
140
        done_searched => $searched,
140
        done_searched => $searched,
141
        routing       => $routing,
141
        routing       => $routing,
142
        additional_field_filters => $additional_field_filters,
142
        additional_field_filters => \@additional_field_filters,
143
        additional_fields_for_subscription => $additional_fields,
143
        additional_fields_for_subscription => \@additional_fields,
144
        marcflavour   => (uc(C4::Context->preference("marcflavour"))),
144
        marcflavour   => (uc(C4::Context->preference("marcflavour"))),
145
        mana => $mana,
145
        mana => $mana,
146
        search_only => 1
146
        search_only => 1
147
- 

Return to bug 15774