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

(-)a/admin/z3950servers.pl (-10 / +9 lines)
Lines 30-35 use C4::Context; Link Here
30
use C4::Auth;
30
use C4::Auth;
31
use C4::Output;
31
use C4::Output;
32
use Koha::Database;
32
use Koha::Database;
33
use Koha::Z3950Servers;
33
34
34
# Initialize CGI, template, database
35
# Initialize CGI, template, database
35
36
Lines 56-62 my $schema = Koha::Database->new()->schema(); Link Here
56
# First process a confirmed delete, or save a validated record
57
# First process a confirmed delete, or save a validated record
57
58
58
if( $op eq 'delete_confirmed' && $id ) {
59
if( $op eq 'delete_confirmed' && $id ) {
59
    my $server = $schema->resultset('Z3950server')->find($id);
60
    my $server = Koha::Z3950Servers->find($id);
60
    if ( $server ) {
61
    if ( $server ) {
61
        $server->delete;
62
        $server->delete;
62
        $template->param( msg_deleted => 1, msg_add => $server->servername );
63
        $template->param( msg_deleted => 1, msg_add => $server->servername );
Lines 70-85 if( $op eq 'delete_confirmed' && $id ) { Link Here
70
        add_xslt/;
71
        add_xslt/;
71
    my $formdata = _form_data_hashref( $input, \@fields );
72
    my $formdata = _form_data_hashref( $input, \@fields );
72
    if( $id ) {
73
    if( $id ) {
73
        my $server = $schema->resultset('Z3950server')->find($id);
74
        my $server = Koha::Z3950Servers->find($id);
74
        if ( $server ) {
75
        if ( $server ) {
75
            $server->update( $formdata );
76
            $server->set( $formdata )->store;
76
            $template->param( msg_updated => 1, msg_add => $formdata->{servername} );
77
            $template->param( msg_updated => 1, msg_add => $formdata->{servername} );
77
        } else {
78
        } else {
78
            $template->param( msg_notfound => 1, msg_add => $id );
79
            $template->param( msg_notfound => 1, msg_add => $id );
79
        }
80
        }
80
        $id = 0;
81
        $id = 0;
81
    } else {
82
    } else {
82
        $schema->resultset('Z3950server')->create( $formdata );
83
        Koha::Z3950Server->new( $formdata )->store;
83
        $template->param( msg_added => 1, msg_add => $formdata->{servername} );
84
        $template->param( msg_added => 1, msg_add => $formdata->{servername} );
84
    }
85
    }
85
} else {
86
} else {
Lines 106-116 output_html_with_http_headers $input, $cookie, $template->output; Link Here
106
107
107
sub ServerSearch  { #find server(s) by id or name
108
sub ServerSearch  { #find server(s) by id or name
108
    my ( $schema, $id, $searchstring )= @_;
109
    my ( $schema, $id, $searchstring )= @_;
109
    my $rs = $schema->resultset('Z3950server')->search(
110
110
        $id ? { id => $id }: { servername => { like => $searchstring.'%' } },
111
    return Koha::Z3950Servers->search(
111
        { result_class => 'DBIx::Class::ResultClass::HashRefInflator' }
112
        $id ? { id => $id } : { servername => { like => $searchstring . '%' } },
112
    );
113
    )->unblessed;
113
    return [ $rs->all ];
114
}
114
}
115
115
116
sub _form_data_hashref {
116
sub _form_data_hashref {
117
- 

Return to bug 23242