From fd015294eca4169d373eee8ecda798245e5ea24e Mon Sep 17 00:00:00 2001 From: Dan Scott Date: Thu, 23 Jan 2014 12:05:20 -0500 Subject: [PATCH] KPAC root, OPAC root: we all live under one root Signed-off-by: Dan Scott Signed-off-by: Ben Shum --- Open-ILS/src/templates/opac/parts/library/core_info.tt2 | 8 +++++++- Open-ILS/src/templates/opac/parts/library_name_link.tt2 | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Open-ILS/src/templates/opac/parts/library/core_info.tt2 b/Open-ILS/src/templates/opac/parts/library/core_info.tt2 index b48c0d7428..1398f7035f 100644 --- a/Open-ILS/src/templates/opac/parts/library/core_info.tt2 +++ b/Open-ILS/src/templates/opac/parts/library/core_info.tt2 @@ -1,3 +1,9 @@ +[%- + opac_root = ctx.opac_root; + IF ctx.kpac_root; + opac_root = ctx.kpac_root; + END; +-%]

[% ctx.library.name | html %]

@@ -41,7 +47,7 @@ [%- IF ctx.library.parent_ou; %]

Branch relationship

[% END; -%] diff --git a/Open-ILS/src/templates/opac/parts/library_name_link.tt2 b/Open-ILS/src/templates/opac/parts/library_name_link.tt2 index c002ce289c..3179e5f62b 100644 --- a/Open-ILS/src/templates/opac/parts/library_name_link.tt2 +++ b/Open-ILS/src/templates/opac/parts/library_name_link.tt2 @@ -1,10 +1,15 @@ [%- + opac_root = ctx.opac_root; + IF ctx.kpac_root; + opac_root = ctx.kpac_root; + END; + org_name = ctx.get_aou(copy_info.circ_lib).name; org_sname = ctx.get_aou(copy_info.circ_lib).shortname; lib_url = ctx.get_org_setting(copy_info.circ_lib, 'lib.info_url'); prefer_external_url = ctx.get_org_setting(copy_info.circ_lib, 'lib.prefer_external_url'); UNLESS lib_url && prefer_external_url; - lib_url = mkurl(ctx.opac_root _ '/library/' _ ctx.get_aou(copy_info.circ_lib).shortname, {}, 1); + lib_url = mkurl(opac_root _ '/library/' _ ctx.get_aou(copy_info.circ_lib).shortname, {}, 1); END; IF lib_url; ''; END; ''; org_name | html; ''; -- 2.43.2