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

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

Return to bug 38340