With the moved of some system preferences to News blocks we need a way to set the default branch from apache such that we can display the right block prior to users login. We used to use SetEnvIf to set various prefs per domain.. it would be great to be able to do the same from branchcode so the News blocks behave as expected.
With a Plack-enabled site, I imagine we'd need to send a custom http header to achieve that?
I wonder if we should actually implement this in Plack, as I think a long-term goal would be to move away from Apache httpd as the reverse proxy. It could help move towards a more multitenanted Koha as well. Might be worthwhile looking at Julian's work on that...
Created attachment 126989 [details] [review] Bug 28955: Add OPAC_BRANCH_DEFAULT This patch adds support for OPAC_BRANCH_DEFAULT as an environment option that can be passed via apache with either SetEnv or as a header for plack. It allows setting a default branch for the anonymous opac session such that you can display the right opac content blocks prior to login if you have set up per branch URI's.
Created attachment 128507 [details] [review] Bug 28955: Add OPAC_BRANCH_DEFAULT This patch adds support for OPAC_BRANCH_DEFAULT as an environment option that can be passed via apache with either SetEnv or as a header for plack. It allows setting a default branch for the anonymous opac session such that you can display the right opac content blocks prior to login if you have set up per branch URI's. To test (on top of bug 29691) 1 - Add to apache conf (/etc/apache2/sites-available/kohadev.conf) SetEnv OPAC_BRANCH_DEFAULT "CPL" RequestHeader add X-Koha-SetEnv "OPAC_BRANCH_DEFAULT CPL" 2 - Restart all 3 - Confirm that news for all and CPL show on opac mainpage 4 - Sign in as a different library 5 - Confirm users library news shows Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
I'm escalating this one a bit as really it's a regression rather than an enhancement.
1. Shouldn't only be passed to the templates for OPAC interface? 2. You are assuming that this "branchcode" variable is passed only for this purpose. Is that true? 3. Where is this "branchcode" actually passed to the template? 4. Did you see that sometimes "logged_in_user.branchcode" is used (opac-main.tt)? Not sure this is correct actually.
(In reply to Martin Renvoize from comment #5) > I'm escalating this one a bit as really it's a regression rather than an > enhancement. How is it a regression? I don't think it was possible before either.
It's a regression in so much as when these were system preferences rather than news blocks you could set them in the apache environment to get a different OPAC look depending on the URL of the virtual host. That is impossible since the move from syspref to news and is causing a number of our upgrades pain.
Created attachment 128569 [details] [review] Bug 28955: Add OPAC_BRANCH_DEFAULT This patch adds support for OPAC_BRANCH_DEFAULT as an environment option that can be passed via apache with either SetEnv or as a header for plack. It allows setting a default branch for the anonymous opac session such that you can display the right opac content blocks prior to login if you have set up per branch URI's.
Created attachment 128570 [details] [review] Bug 28955: (follow-up) Set to fall back This patch updates the original fix to only set the template parameter for opac sessions and updates all occurences in templats to check first for logged_in_user.branchcode before falling back to default_branch
(In reply to Jonathan Druart from comment #6) > 1. Shouldn't only be passed to the templates for OPAC interface? Done > 2. You are assuming that this "branchcode" variable is passed only for this > purpose. Is that true? Renamed to 'default_branch' > 3. Where is this "branchcode" actually passed to the template? I've switched to using a new default_branch and it's always passed for OPAC templates > 4. Did you see that sometimes "logged_in_user.branchcode" is used > (opac-main.tt)? > Not sure this is correct actually. It looks like most occurrences have no actually switched from 'branchcode' to 'logged_in_user.branchcode'.. I've updated all templates to use `logged_in_branch.branchcode || default_branch`
Can you rebase pleae? error: sha1 information is lacking or useless (C4/Auth.pm).
Created attachment 130819 [details] [review] Bug 28955: Add OPAC_BRANCH_DEFAULT This patch adds support for OPAC_BRANCH_DEFAULT as an environment option that can be passed via apache with either SetEnv or as a header for plack. It allows setting a default branch for the anonymous opac session such that you can display the right opac content blocks prior to login if you have set up per branch URI's.
Created attachment 130820 [details] [review] Bug 28955: (follow-up) Set to fall back This patch updates the original fix to only set the template parameter for opac sessions and updates all occurences in templats to check first for logged_in_user.branchcode before falling back to default_branch
Created attachment 130823 [details] [review] Bug 28955: Add OPAC_BRANCH_DEFAULT This patch adds support for OPAC_BRANCH_DEFAULT as an environment option that can be passed via apache with either SetEnv or as a header for plack. It allows setting a default branch for the anonymous opac session such that you can display the right opac content blocks prior to login if you have set up per branch URI's. To test (on top of bug 29691) 1 - Add to apache conf (/etc/apache2/sites-available/kohadev.conf) SetEnv OPAC_BRANCH_DEFAULT "CPL" RequestHeader add X-Koha-SetEnv "OPAC_BRANCH_DEFAULT CPL" 2 - Restart all 3 - Confirm that news for all and CPL show on opac mainpage 4 - Sign in as a different library 5 - Confirm users library news shows Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Created attachment 130824 [details] [review] Bug 28955: (follow-up) Set to fall back This patch updates the original fix to only set the template parameter for opac sessions and updates all occurences in templats to check first for logged_in_user.branchcode before falling back to default_branch
Rebased :)
> 3 - Confirm that news for all and CPL show on opac mainpage This is failing. We are not impacting "News", but "HTML customizations". Is the test plan wrong or we are missing something in the patch? What was the previous behaviour?
Created attachment 130862 [details] [review] Bug 28955: Impact News as well
(In reply to Jonathan Druart from comment #19) > Created attachment 130862 [details] [review] [review] > Bug 28955: Impact News as well We could go with this trivial patch, do you agree?
I lifted the test plan from Nicks comment, but I forgot to set bug 29691 as a dependency. However, I like the simplicity of your patch and would happily go with it in the interim and reverse the dependencies whilst we work out the fix for the current FQA bug above.
Created attachment 130949 [details] [review] Bug 28955: Add OPAC_BRANCH_DEFAULT This patch adds support for OPAC_BRANCH_DEFAULT as an environment option that can be passed via apache with either SetEnv or as a header for plack. It allows setting a default branch for the anonymous opac session such that you can display the right opac content blocks prior to login if you have set up per branch URI's. To test (on top of bug 29691) 1 - Add to apache conf (/etc/apache2/sites-available/kohadev.conf) SetEnv OPAC_BRANCH_DEFAULT "CPL" RequestHeader add X-Koha-SetEnv "OPAC_BRANCH_DEFAULT CPL" 2 - Restart all 3 - Confirm that news for all and CPL show on opac mainpage 4 - Sign in as a different library 5 - Confirm users library news shows Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Created attachment 130950 [details] [review] Bug 28955: (follow-up) Set to fall back This patch updates the original fix to only set the template parameter for opac sessions and updates all occurences in templats to check first for logged_in_user.branchcode before falling back to default_branch Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Created attachment 130951 [details] [review] Bug 28955: Impact News as well Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Pushed to master for 22.05, thanks to everybody involved [U+1F984]
Doesn't apply to 21.11.x. If this should be backported please rebase and ping me!
Created attachment 131833 [details] [review] Bug 28955: Add OPAC_BRANCH_DEFAULT [21.11] This patch adds support for OPAC_BRANCH_DEFAULT as an environment option that can be passed via apache with either SetEnv or as a header for plack. It allows setting a default branch for the anonymous opac session such that you can display the right opac content blocks prior to login if you have set up per branch URI's. To test (on top of bug 29691) 1 - Add to apache conf (/etc/apache2/sites-available/kohadev.conf) SetEnv OPAC_BRANCH_DEFAULT "CPL" RequestHeader add X-Koha-SetEnv "OPAC_BRANCH_DEFAULT CPL" 2 - Restart all 3 - Confirm that news for all and CPL show on opac mainpage 4 - Sign in as a different library 5 - Confirm users library news shows Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Created attachment 131834 [details] [review] Bug 28955: (follow-up) Set to fall back [21.11] This patch updates the original fix to only set the template parameter for opac sessions and updates all occurences in templats to check first for logged_in_user.branchcode before falling back to default_branch Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Created attachment 131835 [details] [review] Bug 28955: Impact News as well [21.11] Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Pushed to 21.11 for 21.11.07, thx!
Missing dependencies for 21.05.x, it shouldn't be affected, no backport.