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

(-)a/Koha/Libraries.pm (-1 / +1 lines)
Lines 28-34 use Koha::Items; Link Here
28
use Koha::Library;
28
use Koha::Library;
29
use Koha::Patrons;
29
use Koha::Patrons;
30
30
31
use base qw(Koha::Objects);
31
use base qw(Koha::Objects::Mixin::AdditionalFields Koha::Objects);
32
32
33
=head1 NAME
33
=head1 NAME
34
34
(-)a/Koha/Library.pm (-1 / +1 lines)
Lines 28-34 use Koha::StockRotationStages; Link Here
28
use Koha::SMTP::Servers;
28
use Koha::SMTP::Servers;
29
use Koha::Library::Hours;
29
use Koha::Library::Hours;
30
30
31
use base qw(Koha::Object);
31
use base qw(Koha::Object::Mixin::AdditionalFields Koha::Object);
32
32
33
my $cache = Koha::Caches->get_instance();
33
my $cache = Koha::Caches->get_instance();
34
34
(-)a/admin/branches.pl (+20 lines)
Lines 28-33 use C4::Context; Link Here
28
use C4::Output qw( output_html_with_http_headers );
28
use C4::Output qw( output_html_with_http_headers );
29
use C4::Koha;
29
use C4::Koha;
30
30
31
use Koha::AdditionalFields;
31
use Koha::Database;
32
use Koha::Database;
32
use Koha::Patrons;
33
use Koha::Patrons;
33
use Koha::Items;
34
use Koha::Items;
Lines 50-55 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
50
    }
51
    }
51
);
52
);
52
53
54
if ($branchcode) {
55
    my @additional_fields = Koha::AdditionalFields->search( { tablename => 'branches' } )->as_list;
56
    my @additional_field_values;
57
    @additional_field_values = Koha::Libraries->find($branchcode)->get_additional_field_values_for_template;
58
59
    $template->param(
60
        additional_fields       => \@additional_fields,
61
        additional_field_values => @additional_field_values,
62
    );
63
}
64
53
if ( $op eq 'add_form' ) {
65
if ( $op eq 'add_form' ) {
54
    $template->param(
66
    $template->param(
55
        library      => Koha::Libraries->find($branchcode),
67
        library      => Koha::Libraries->find($branchcode),
Lines 148-153 if ( $op eq 'add_form' ) { Link Here
148
                        $index++;
160
                        $index++;
149
                    }
161
                    }
150
162
163
                    my @additional_fields =
164
                        Koha::Libraries->find($branchcode)->prepare_cgi_additional_field_values( $input, 'branches' );
165
                    Koha::Libraries->find($branchcode)->set_additional_fields( \@additional_fields );
166
151
                    push @messages, { type => 'message', code => 'success_on_update' };
167
                    push @messages, { type => 'message', code => 'success_on_update' };
152
                }
168
                }
153
            );
169
            );
Lines 209-214 if ( $op eq 'add_form' ) { Link Here
209
                        $index++;
225
                        $index++;
210
                    }
226
                    }
211
227
228
                    my @additional_fields =
229
                        Koha::Libraries->find($branchcode)->prepare_cgi_additional_field_values( $input, 'branches' );
230
                    Koha::Libraries->find($branchcode)->set_additional_fields( \@additional_fields );
231
212
                    push @messages, { type => 'message', code => 'success_on_insert' };
232
                    push @messages, { type => 'message', code => 'success_on_insert' };
213
                }
233
                }
214
            );
234
            );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt (-1 / +8 lines)
Lines 370-375 Link Here
370
                    </li>
370
                    </li>
371
                </ol>
371
                </ol>
372
            </fieldset>
372
            </fieldset>
373
            [% INCLUDE 'additional-fields-entry.inc' available=additional_fields values=additional_field_values wrap_fieldset=1 %]
373
            <fieldset class="action">
374
            <fieldset class="action">
374
                <input type="submit" class="btn btn-primary" value="Submit" />
375
                <input type="submit" class="btn btn-primary" value="Submit" />
375
                <a class="cancel" href="/cgi-bin/koha/admin/branches.pl">Cancel</a>
376
                <a class="cancel" href="/cgi-bin/koha/admin/branches.pl">Cancel</a>
Lines 613-618 Link Here
613
            <!-- /.col-sm-6 -->
614
            <!-- /.col-sm-6 -->
614
        </div>
615
        </div>
615
        <!-- /.row -->
616
        <!-- /.row -->
617
	    [% IF additional_fields && additional_field_values %]
618
	        <div class="rows page-section">
619
	            <h2>Additional fields</h2>
620
	            [% INCLUDE 'additional-fields-display.inc' available=additional_fields values=additional_field_values %]
621
	        </div>
622
	    [% END %]
616
        [% IF OpacLibraryInfo %]
623
        [% IF OpacLibraryInfo %]
617
            <!-- opac_info -->
624
            <!-- opac_info -->
618
            <div class="row page-section">
625
            <div class="row page-section">
Lines 629-634 Link Here
629
636
630
[% MACRO jsinclude BLOCK %]
637
[% MACRO jsinclude BLOCK %]
631
    [% Asset.js("js/admin-menu.js") | $raw %]
638
    [% Asset.js("js/admin-menu.js") | $raw %]
639
    [% Asset.js("js/additional-fields-entry.js") | $raw %]
632
    [% INCLUDE 'calendar.inc' %]
640
    [% INCLUDE 'calendar.inc' %]
633
    [% INCLUDE 'datatables.inc' %]
641
    [% INCLUDE 'datatables.inc' %]
634
    [% Asset.js( "lib/codemirror/codemirror.min.js" ) | $raw %]
642
    [% Asset.js( "lib/codemirror/codemirror.min.js" ) | $raw %]
635
- 

Return to bug 38663