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

(-)a/Koha/ILL/Request.pm (-37 / +29 lines)
Lines 1185-1241 sub expand_template { Link Here
1185
    my ( $self, $params ) = @_;
1185
    my ( $self, $params ) = @_;
1186
    my $backend = $self->_backend->name;
1186
    my $backend = $self->_backend->name;
1187
1187
1188
    if (
1188
    my $auto_priority  = C4::Context->preference("AutoILLBackendPriority");
1189
        $backend eq 'Standard'
1189
    my $unauth_request = C4::Context->preference("ILLOpacUnauthenticatedRequest");
1190
        || ( $params->{method} && $params->{method} eq 'edititem' && C4::Context->preference("AutoILLBackendPriority") )
1190
    my $method         = $params->{method} // q{};
1191
        )
1191
    my $template_name  = "ill/backends/Standard/$method.inc";
1192
    {
1193
1192
1194
        my $template_name = 'ill/backends/Standard/' . ( $params->{method} // q{} ) . '.inc';
1193
    if ( $backend eq 'Standard' || ( $method eq 'edititem' && $auto_priority ) ) {
1195
1196
        # Set files to load
1197
        $params->{template}      = $template_name;
1194
        $params->{template}      = $template_name;
1198
        $params->{opac_template} = $template_name;
1195
        $params->{opac_template} = $template_name;
1199
    } elsif ( $params->{error}
1196
        return $params;
1200
        && $params->{status} eq 'failed_captcha'
1197
    }
1201
        && C4::Context->preference("AutoILLBackendPriority") )
1202
    {
1203
        my $template_name = 'ill/backends/Standard/' . ( $params->{method} // q{} ) . '.inc';
1204
1198
1205
        # Set files to load
1199
    if ( $params->{error} && $params->{status} eq 'failed_captcha' && $auto_priority && $unauth_request ) {
1206
        $params->{template}      = $template_name;
1200
        $params->{template}      = $template_name;
1207
        $params->{opac_template} = $template_name;
1201
        $params->{opac_template} = $template_name;
1208
        $params->{stage}         = 'form';
1202
        $params->{stage}         = 'form';
1209
    } else {
1203
        return $params;
1210
        my $plugin = $self->get_backend_plugin( $self->_backend->name );
1204
    }
1211
1212
        # Generate path to file to load
1213
        my $backend_dir;
1214
        my $backend_tmpl;
1215
1205
1216
        if ($plugin) {
1206
    my $plugin = $self->get_backend_plugin( $self->_backend->name );
1217
1207
1218
            # New way of loading backends: Through plugins
1208
    # Generate path to file to load
1219
            $backend_dir  = $plugin->bundle_path;
1209
    my $backend_dir;
1220
            $backend_tmpl = $backend_dir;
1210
    my $backend_tmpl;
1221
1211
1222
        } else {
1212
    if ($plugin) {
1223
1213
1224
            # Old way of loading backends: Through backend_dir config
1214
        # New way of loading backends: Through plugins
1225
            $backend_dir  = $self->_config->backend_dir;
1215
        $backend_dir  = $plugin->bundle_path;
1226
            $backend_tmpl = join "/", $backend_dir, $backend;
1216
        $backend_tmpl = $backend_dir;
1227
        }
1228
1217
1229
        my $intra_tmpl = join "/", $backend_tmpl, "intra-includes",
1218
    } else {
1230
            ( $params->{method} // q{} ) . ".inc";
1231
        my $opac_tmpl = join "/", $backend_tmpl, "opac-includes",
1232
            ( $params->{method} // q{} ) . ".inc";
1233
1219
1234
        # Set files to load
1220
        # Old way of loading backends: Through backend_dir config
1235
        $params->{template}      = $intra_tmpl;
1221
        $backend_dir  = $self->_config->backend_dir;
1236
        $params->{opac_template} = $opac_tmpl;
1222
        $backend_tmpl = join "/", $backend_dir, $backend;
1237
    }
1223
    }
1238
1224
1225
    my $intra_tmpl = join "/", $backend_tmpl, "intra-includes", "$method.inc";
1226
    my $opac_tmpl  = join "/", $backend_tmpl, "opac-includes",  "$method.inc";
1227
1228
    # Set files to load
1229
    $params->{template}      = $intra_tmpl;
1230
    $params->{opac_template} = $opac_tmpl;
1231
1239
    return $params;
1232
    return $params;
1240
}
1233
}
1241
1234
1242
- 

Return to bug 41478