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

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

Return to bug 41478