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

(-)a/Koha/ILL/Request.pm (-24 / +31 lines)
Lines 1156-1191 sub expand_template { Link Here
1156
    my ( $self, $params ) = @_;
1156
    my ( $self, $params ) = @_;
1157
    my $backend = $self->_backend->name;
1157
    my $backend = $self->_backend->name;
1158
1158
1159
    # Generate path to file to load
1159
    if ( $backend eq 'Standard' ) {
1160
    my $backend_dir;
1161
    my $backend_tmpl;
1162
1160
1163
    my $backend_plugin = $self->get_backend_plugin( $self->_backend->name );
1161
        my $template_name = 'ill/backends/Standard/' . ( $params->{method} // q{} ) . '.inc';
1164
    if ($backend_plugin) {
1165
1162
1166
        # New way of loading backends: Through plugins
1163
        # Set files to load
1167
        $backend_dir  = $backend_plugin->bundle_path;
1164
        $params->{template}      = $template_name;
1168
        $backend_tmpl = $backend_dir;
1165
        $params->{opac_template} = $template_name;
1169
1166
1170
    } elsif ( $backend eq 'Standard' ) {
1171
1172
        # Check for core Standard backend
1173
        $backend_tmpl = dirname(__FILE__) . '/Backend';
1174
    } else {
1167
    } else {
1168
        my $backend_plugin = $self->get_backend_plugin( $self->_backend->name );
1175
1169
1176
        # Old way of loading backends: Through backend_dir config
1170
        # Generate path to file to load
1177
        $backend_dir  = $self->_config->backend_dir;
1171
        my $backend_dir;
1178
        $backend_tmpl = join "/", $backend_dir, $backend;
1172
        my $backend_tmpl;
1179
    }
1173
1174
        if ($backend_plugin) {
1175
1176
            # New way of loading backends: Through plugins
1177
            $backend_dir  = $backend_plugin->bundle_path;
1178
            $backend_tmpl = $backend_dir;
1179
1180
        } else {
1181
1182
            # Old way of loading backends: Through backend_dir config
1183
            $backend_dir  = $self->_config->backend_dir;
1184
            $backend_tmpl = join "/", $backend_dir, $backend;
1185
        }
1180
1186
1181
    my $intra_tmpl = join "/", $backend_tmpl, "intra-includes",
1187
        my $intra_tmpl = join "/", $backend_tmpl, "intra-includes",
1182
        ( $params->{method} // q{} ) . ".inc";
1188
            ( $params->{method} // q{} ) . ".inc";
1183
    my $opac_tmpl = join "/", $backend_tmpl, "opac-includes",
1189
        my $opac_tmpl = join "/", $backend_tmpl, "opac-includes",
1184
        ( $params->{method} // q{} ) . ".inc";
1190
            ( $params->{method} // q{} ) . ".inc";
1191
1192
        # Set files to load
1193
        $params->{template}      = $intra_tmpl;
1194
        $params->{opac_template} = $opac_tmpl;
1195
    }
1185
1196
1186
    # Set files to load
1187
    $params->{template}      = $intra_tmpl;
1188
    $params->{opac_template} = $opac_tmpl;
1189
    return $params;
1197
    return $params;
1190
}
1198
}
1191
1199
1192
- 

Return to bug 38340