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

(-)a/authorities/authorities-home.pl (-14 / +11 lines)
Lines 214-235 if ( $op eq '' ) { Link Here
214
214
215
}
215
}
216
216
217
4 if ( $op ne "do_search" ) {
217
my $schema = Koha::Database->new()->schema();
218
     my $schema = Koha::Database->new()->schema();
218
my $servers = $schema->resultset('Z3950server')->search(
219
     my $rs = $schema->resultset('Z3950server')->search(
219
    {
220
         {
220
        recordtype => 'biblio',
221
         recordtype => 'biblio',
221
        servertype => ['zed', 'sru'],
222
         servertype => ['zed', 'sru'],
222
    },
223
       },
223
    {   result_class => 'DBIx::Class::ResultClass::HashRefInflator',
224
         {   result_class => 'DBIx::Class::ResultClass::HashRefInflator',
224
        order_by     => ['rank', 'servername'],
225
             order_by     => ['rank', 'servername'],
225
    },
226
      },
226
);
227
     );
228
      $template->param(
229
     serverloop   => [ $rs->all ],
230
    )
231
227
232
$template->param(
228
$template->param(
229
    servers => $servers,
233
    authority_types => $authority_types,
230
    authority_types => $authority_types,
234
    op            => $op,
231
    op            => $op,
235
);
232
);
(-)a/cataloguing/addbooks.pl (-6 / +6 lines)
Lines 133-152 for my $resultsbr (@resultsbr) { Link Here
133
    };
133
    };
134
}
134
}
135
135
136
my $rs = $schema->resultset('Z3950server')->search(
136
my $schema = Koha::Database->new()->schema();
137
my $servers = $schema->resultset('Z3950server')->search(
137
    {
138
    {
138
    recordtype => 'biblio',
139
        recordtype => 'biblio',
139
    servertype => ['zed', 'sru'],
140
        servertype => ['zed', 'sru'],
140
    },
141
    },
141
    {   result_class => 'DBIx::Class::ResultClass::HashRefInflator',
142
    {   result_class => 'DBIx::Class::ResultClass::HashRefInflator',
142
        order_by     => ['rank', 'servername'],
143
        order_by     => ['rank', 'servername'],
143
    },
144
    },
144
    );
145
);
145
    $template->param(
146
        serverloop   => [ $rs->all ],
147
146
148
my $frameworks = Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] });
147
my $frameworks = Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] });
149
$template->param(
148
$template->param(
149
    servers           => $servers,
150
    frameworks        => $frameworks,
150
    frameworks        => $frameworks,
151
    breeding_count    => $countbr,
151
    breeding_count    => $countbr,
152
    breeding_loop     => $breeding_loop,
152
    breeding_loop     => $breeding_loop,
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc (-1 / +1 lines)
Lines 59-65 Link Here
59
            [% END %]
59
            [% END %]
60
        </ul>
60
        </ul>
61
    </div>
61
    </div>
62
    [% IF server %]
62
    [% IF servers.count > 0 %]
63
    <div class="btn-group">
63
    <div class="btn-group">
64
        <a class="btn btn-default btn-sm" id="z3950submit" href="#"><i class="fa fa-search"></i> New from Z39.50</a>
64
        <a class="btn btn-default btn-sm" id="z3950submit" href="#"><i class="fa fa-search"></i> New from Z39.50</a>
65
    </div>
65
    </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt (-3 / +2 lines)
Lines 30-42 Link Here
30
                [% END %]
30
                [% END %]
31
            </ul>
31
            </ul>
32
        </div>
32
        </div>
33
        [% IF server %]
33
        [% IF servers.count > 0 %]
34
        <div class="btn-group">
34
        <div class="btn-group">
35
            <button class="btn btn-default btn-sm" id="z3950search"><i class="fa fa-search"></i> New from Z39.50/SRU</button>
35
            <button class="btn btn-default btn-sm" id="z3950search"><i class="fa fa-search"></i> New from Z39.50/SRU</button>
36
            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
36
            <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
37
                <span class="caret"></span>
37
                <span class="caret"></span>
38
            </button>
38
            </button>
39
            [% END %]
40
            <ul class="dropdown-menu">
39
            <ul class="dropdown-menu">
41
                <li id="" class="z3950searchFw"><a href="#">Default framework</a></li>
40
                <li id="" class="z3950searchFw"><a href="#">Default framework</a></li>
42
                [% FOREACH framework IN frameworks %]
41
                [% FOREACH framework IN frameworks %]
Lines 44-49 Link Here
44
                [% END %]
43
                [% END %]
45
            </ul>
44
            </ul>
46
        </div>
45
        </div>
46
         [% END %]
47
    [% IF ( total ) %]
47
    [% IF ( total ) %]
48
        <div class="btn-group"><button type="submit" class="btn btn-default btn-sm merge-items"><i class="fa fa-compress"></i> Merge selected</button></div>
48
        <div class="btn-group"><button type="submit" class="btn btn-default btn-sm merge-items"><i class="fa fa-compress"></i> Merge selected</button></div>
49
    [% END %]
49
    [% END %]
50
- 

Return to bug 19987