[Bug 32721] New: Allow UserCSS and UserJS at branch level
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Bug ID: 32721 Summary: Allow UserCSS and UserJS at branch level Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: NEW Severity: enhancement Priority: P5 - low Component: OPAC Assignee: oleonard@myacpl.org Reporter: matt.blenkinsop@ptfs-europe.com QA Contact: testopia@bugs.koha-community.org It would be useful to be able to add UserCSS and JS at branch level rather than globally across all OPACs. This will improve customisation and streamline the way we inject the UserJS and UserCSS into the templates. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|oleonard@myacpl.org |matt.blenkinsop@ptfs-europe | |.com -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #1 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 145731 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=145731&action=edit Bug 32721: Add branch specific userjs and usercss This patch allows for branch specific userJS and userCSS to be added through the libraries table. This works in conjunction with the global UserJS and UserCSS functionality and allows for multiple OPACs with different css and js options. Test plan: 1) Add to apache conf (/etc/apache2/sites-available/kohadev.conf) SetEnv OPAC_BRANCH_DEFAULT "FFL" RequestHeader add X-Koha-SetEnv "OPAC_BRANCH_DEFAULT FFL" 2) In the container, run restart_all 3) Navigate to the OPACUserJS and OPACUserCSS system preferences and add the following: OPACUserJS - console.log('Hello from global sysprefs');, OPACUserCSS - 'body { background-color: black; }' 4) Refresh the OPAC and the background should be black and the message should be logged to the console in developer tools 5) Navigate to Administration > Libraries 6) On the Fairfield branch (if this does not exist you will need to create a branch with a code matching the code that you added to the apache conf file), click edit 7) At the bottom there should be two fields to add userjs and usercss, complete with Codemirror syntax checking 8) In userjs add console.log('Hello from branch level'); and in usercss add 'body { background-color: blue; } then save 9) Return to the OPAC and refresh 10) If you are logged out of the OPAC it should now be logging both the message from global and from the branch level and the background should be blue (if not you will need to log out) 11) Log back into the OPAC using a user that DOES NOT have a default branch matching the branch you added to the Apache conf 12) The OPAC should now revert to only showing the global message in the console with a black background Sponsored-by: PTFS Europe -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #2 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 145732 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=145732&action=edit Bug 32721: Database update to add userjs and usercss to branches table This patch adds the columns for userjs and usercss to the branches table Test plan as per previous commit -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #3 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 145733 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=145733&action=edit Bug 32721: DBIC Schema This commit adds the DBIC Schema for the database change -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #4 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 145734 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=145734&action=edit Bug 32721: Add unit tests Unit tests to test two new functions: GetBranchSpecificJS and GetBranchSpecificCSS Test plan: 1) In the shell run prove -t t/db_dependent/Template/Plugin/Branches.t -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #5 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 145735 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=145735&action=edit Bug 32721: Tidy up - duplicate fetching of userjs and css Currently UserJS and UserCSS is injected into the template as a parameter through Auth.pm but is then fetched using Koha.Preference() in the template. This patch tidies this up by removing the parameters from Auth.pm Test plan as per first commit -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA --- Comment #6 from Owen Leonard <oleonard@myacpl.org> --- This appears to work well, but there are a few issues raised by the QA tool which need to be addressed. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #7 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 145754 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=145754&action=edit Bug 32721: (QA follow up) - fix QA issues This patches addresses issues raised by the QA tests. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |kyle@bywatersolutions.com, | |martin.renvoize@ptfs-europe | |.com, | |nick@bywatersolutions.com -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #145754|0 |1 is obsolete| | --- Comment #8 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 145759 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=145759&action=edit Bug 32721: (QA follow up) - fix QA issues This patches addresses issues raised by the QA tests. It also adds a missed import of the Branches file in the document head -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Lucas Gass <lucas@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |lucas@bywatersolutions.com --- Comment #9 from Lucas Gass <lucas@bywatersolutions.com> --- Im confused by this step: 10) If you are logged out of the OPAC it should now be logging both the message from global and from the branch level and the background should be blue (if not you will need to log out) If I log out of the OPAC I should be seeing the branch level JS/CSS? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #10 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Hi Lucas, if you are logged in then your user will have a default branch - you should see the UserJs and CSS for that patron branch which may be different to the branch that you set in your Apache config. For example if you set the OPAC as having a default code of FPL and you are logged into the OPAC with a patron that has a branch code of CPL, you will see the settings for CPL and not FPL as the patron will override the default. Therefore you would need to log out to see your UserJS and CSS changes for the FPL branch. You can also set specific UserJS and CSS for the CPL branch and that will appear when you are logged in as a CPL user. Hope that makes sense! -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Lucas Gass <lucas@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Lucas Gass <lucas@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #145731|0 |1 is obsolete| | --- Comment #11 from Lucas Gass <lucas@bywatersolutions.com> --- Created attachment 146159 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=146159&action=edit Bug 32721: Add branch specific userjs and usercss This patch allows for branch specific userJS and userCSS to be added through the libraries table. This works in conjunction with the global UserJS and UserCSS functionality and allows for multiple OPACs with different css and js options. Test plan: 1) Add to apache conf (/etc/apache2/sites-available/kohadev.conf) SetEnv OPAC_BRANCH_DEFAULT "FFL" RequestHeader add X-Koha-SetEnv "OPAC_BRANCH_DEFAULT FFL" 2) In the container, run restart_all 3) Navigate to the OPACUserJS and OPACUserCSS system preferences and add the following: OPACUserJS - console.log('Hello from global sysprefs');, OPACUserCSS - 'body { background-color: black; }' 4) Refresh the OPAC and the background should be black and the message should be logged to the console in developer tools 5) Navigate to Administration > Libraries 6) On the Fairfield branch (if this does not exist you will need to create a branch with a code matching the code that you added to the apache conf file), click edit 7) At the bottom there should be two fields to add userjs and usercss, complete with Codemirror syntax checking 8) In userjs add console.log('Hello from branch level'); and in usercss add 'body { background-color: blue; } then save 9) Return to the OPAC and refresh 10) If you are logged out of the OPAC it should now be logging both the message from global and from the branch level and the background should be blue (if not you will need to log out) 11) Log back into the OPAC using a user that DOES NOT have a default branch matching the branch you added to the Apache conf 12) The OPAC should now revert to only showing the global message in the console with a black background Sponsored-by: PTFS Europe Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Lucas Gass <lucas@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #145732|0 |1 is obsolete| | --- Comment #12 from Lucas Gass <lucas@bywatersolutions.com> --- Created attachment 146160 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=146160&action=edit Bug 32721: Database update to add userjs and usercss to branches table This patch adds the columns for userjs and usercss to the branches table Test plan as per previous commit Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Lucas Gass <lucas@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #145733|0 |1 is obsolete| | --- Comment #13 from Lucas Gass <lucas@bywatersolutions.com> --- Created attachment 146161 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=146161&action=edit Bug 32721: DBIC Schema This commit adds the DBIC Schema for the database change Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Lucas Gass <lucas@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #145734|0 |1 is obsolete| | --- Comment #14 from Lucas Gass <lucas@bywatersolutions.com> --- Created attachment 146162 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=146162&action=edit Bug 32721: Add unit tests Unit tests to test two new functions: GetBranchSpecificJS and GetBranchSpecificCSS Test plan: 1) In the shell run prove -t t/db_dependent/Template/Plugin/Branches.t Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Lucas Gass <lucas@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #145735|0 |1 is obsolete| | --- Comment #15 from Lucas Gass <lucas@bywatersolutions.com> --- Created attachment 146163 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=146163&action=edit Bug 32721: Tidy up - duplicate fetching of userjs and css Currently UserJS and UserCSS is injected into the template as a parameter through Auth.pm but is then fetched using Koha.Preference() in the template. This patch tidies this up by removing the parameters from Auth.pm Test plan as per first commit Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Lucas Gass <lucas@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #145759|0 |1 is obsolete| | --- Comment #16 from Lucas Gass <lucas@bywatersolutions.com> --- Created attachment 146164 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=146164&action=edit Bug 32721: (QA follow up) - fix QA issues This patches addresses issues raised by the QA tests. It also adds a missed import of the Branches file in the document head Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jonathan.druart+koha@gmail. | |com --- Comment #17 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- QA comments: 1. There are still a couple of ref to tinymce in the template 2. Not blocker but it would be nice to see the codemirror code centralised in an include file to avoid code duplication 3. You didn't modify all the occurrences of OPACUserCSS in template, is that on purpose? koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt:[% IF ( Koha.Preference('OPACUserCSS') ) %]<style>[% Koha.Preference('OPACUserCSS') | $raw %]</style>[% END %] koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt:[% IF ( Koha.Preference('OPACUserCSS') ) %]<style>[% Koha.Preference('OPACUserCSS') | $raw %]</style>[% END %] koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt:[% IF ( Koha.Preference('OPACUserCSS') ) %]<style>[% Koha.Preference('OPACUserCSS') | $raw %]</style>[% END %] I don't know if it's relevant, just asking. 4. There is one more QA failure FAIL installer/data/mysql/atomicupdate/bug_32721-add_branch_level_js.pl FAIL file permissions File must have the exec flag -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #18 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 147373 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=147373&action=edit Bug 32721: (QA follow-up) Add missing imports Missing imports added in three template files Exec flag added to atomic update file Tinymce imports removed A new bug will be created to move codemirror into an inc file at latest version Test plan as before -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Patrick Robitaille <patrick.robitaille@collecto.ca> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |patrick.robitaille@collecto | |.ca -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #19 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- I got a conflict on the "Tidy up" patch that I managed to fix, but then another one: error: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt). -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #146159|0 |1 is obsolete| | --- Comment #20 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 149860 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=149860&action=edit Bug 32721: Add branch specific userjs and usercss This patch allows for branch specific userJS and userCSS to be added through the libraries table. This works in conjunction with the global UserJS and UserCSS functionality and allows for multiple OPACs with different css and js options. Test plan: 1) Add to apache conf (/etc/apache2/sites-available/kohadev.conf) SetEnv OPAC_BRANCH_DEFAULT "FFL" RequestHeader add X-Koha-SetEnv "OPAC_BRANCH_DEFAULT FFL" 2) In the container, run restart_all 3) Navigate to the OPACUserJS and OPACUserCSS system preferences and add the following: OPACUserJS - console.log('Hello from global sysprefs');, OPACUserCSS - 'body { background-color: black; }' 4) Refresh the OPAC and the background should be black and the message should be logged to the console in developer tools 5) Navigate to Administration > Libraries 6) On the Fairfield branch (if this does not exist you will need to create a branch with a code matching the code that you added to the apache conf file), click edit 7) At the bottom there should be two fields to add userjs and usercss, complete with Codemirror syntax checking 8) In userjs add console.log('Hello from branch level'); and in usercss add 'body { background-color: blue; } then save 9) Return to the OPAC and refresh 10) If you are logged out of the OPAC it should now be logging both the message from global and from the branch level and the background should be blue (if not you will need to log out) 11) Log back into the OPAC using a user that DOES NOT have a default branch matching the branch you added to the Apache conf 12) The OPAC should now revert to only showing the global message in the console with a black background Sponsored-by: PTFS Europe Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #146160|0 |1 is obsolete| | --- Comment #21 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 149861 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=149861&action=edit Bug 32721: Database update to add userjs and usercss to branches table This patch adds the columns for userjs and usercss to the branches table Test plan as per previous commit Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #146161|0 |1 is obsolete| | --- Comment #22 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 149862 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=149862&action=edit Bug 32721: DBIC Schema This commit adds the DBIC Schema for the database change Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #146162|0 |1 is obsolete| | --- Comment #23 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 149863 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=149863&action=edit Bug 32721: Add unit tests Unit tests to test two new functions: GetBranchSpecificJS and GetBranchSpecificCSS Test plan: 1) In the shell run prove -t t/db_dependent/Template/Plugin/Branches.t Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #146163|0 |1 is obsolete| | --- Comment #24 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 149864 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=149864&action=edit Bug 32721: Tidy up - duplicate fetching of userjs and css Currently UserJS and UserCSS is injected into the template as a parameter through Auth.pm but is then fetched using Koha.Preference() in the template. This patch tidies this up by removing the parameters from Auth.pm Test plan as per first commit Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #146164|0 |1 is obsolete| | --- Comment #25 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 149865 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=149865&action=edit Bug 32721: (QA follow up) - fix QA issues This patches addresses issues raised by the QA tests. It also adds a missed import of the Branches file in the document head Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #147373|0 |1 is obsolete| | --- Comment #26 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 149866 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=149866&action=edit Bug 32721: (QA follow-up) Add missing imports Missing imports added in three template files Exec flag added to atomic update file Tinymce imports removed A new bug will be created to move codemirror into an inc file at latest version Test plan as before -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Signed Off --- Comment #27 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Rebased - resetting to Signed off as previous status -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Sally <sally.healey@cheshiresharedservices.gov.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |sally.healey@cheshireshared | |services.gov.uk -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|Allow UserCSS and UserJS at |Allow UserCSS and UserJS at |branch level |library level -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |katrin.fischer@bsz-bw.de -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #28 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 150713 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=150713&action=edit Bug 32721: Highlight the branch specific option from the global syspref Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #149860|0 |1 is obsolete| | Attachment #149861|0 |1 is obsolete| | Attachment #149862|0 |1 is obsolete| | Attachment #149863|0 |1 is obsolete| | Attachment #149864|0 |1 is obsolete| | Attachment #149865|0 |1 is obsolete| | Attachment #149866|0 |1 is obsolete| | Attachment #150713|0 |1 is obsolete| | --- Comment #29 from Nick Clemens <nick@bywatersolutions.com> --- Created attachment 150724 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=150724&action=edit Bug 32721: Add branch specific userjs and usercss This patch allows for branch specific userJS and userCSS to be added through the libraries table. This works in conjunction with the global UserJS and UserCSS functionality and allows for multiple OPACs with different css and js options. Test plan: 1) Add to apache conf (/etc/apache2/sites-available/kohadev.conf) SetEnv OPAC_BRANCH_DEFAULT "FFL" RequestHeader add X-Koha-SetEnv "OPAC_BRANCH_DEFAULT FFL" 2) In the container, run restart_all 3) Navigate to the OPACUserJS and OPACUserCSS system preferences and add the following: OPACUserJS - console.log('Hello from global sysprefs');, OPACUserCSS - 'body { background-color: black; }' 4) Refresh the OPAC and the background should be black and the message should be logged to the console in developer tools 5) Navigate to Administration > Libraries 6) On the Fairfield branch (if this does not exist you will need to create a branch with a code matching the code that you added to the apache conf file), click edit 7) At the bottom there should be two fields to add userjs and usercss, complete with Codemirror syntax checking 8) In userjs add console.log('Hello from branch level'); and in usercss add 'body { background-color: blue; } then save 9) Return to the OPAC and refresh 10) If you are logged out of the OPAC it should now be logging both the message from global and from the branch level and the background should be blue (if not you will need to log out) 11) Log back into the OPAC using a user that DOES NOT have a default branch matching the branch you added to the Apache conf 12) The OPAC should now revert to only showing the global message in the console with a black background Sponsored-by: PTFS Europe Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #30 from Nick Clemens <nick@bywatersolutions.com> --- Created attachment 150725 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=150725&action=edit Bug 32721: Database update to add userjs and usercss to branches table This patch adds the columns for userjs and usercss to the branches table Test plan as per previous commit Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #31 from Nick Clemens <nick@bywatersolutions.com> --- Created attachment 150726 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=150726&action=edit Bug 32721: DBIC Schema This commit adds the DBIC Schema for the database change Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #32 from Nick Clemens <nick@bywatersolutions.com> --- Created attachment 150727 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=150727&action=edit Bug 32721: Add unit tests Unit tests to test two new functions: GetBranchSpecificJS and GetBranchSpecificCSS Test plan: 1) In the shell run prove -t t/db_dependent/Template/Plugin/Branches.t Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #33 from Nick Clemens <nick@bywatersolutions.com> --- Created attachment 150728 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=150728&action=edit Bug 32721: Tidy up - duplicate fetching of userjs and css Currently UserJS and UserCSS is injected into the template as a parameter through Auth.pm but is then fetched using Koha.Preference() in the template. This patch tidies this up by removing the parameters from Auth.pm Test plan as per first commit Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #34 from Nick Clemens <nick@bywatersolutions.com> --- Created attachment 150729 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=150729&action=edit Bug 32721: (QA follow up) - fix QA issues This patches addresses issues raised by the QA tests. It also adds a missed import of the Branches file in the document head Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #35 from Nick Clemens <nick@bywatersolutions.com> --- Created attachment 150730 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=150730&action=edit Bug 32721: (QA follow-up) Add missing imports Missing imports added in three template files Exec flag added to atomic update file Tinymce imports removed A new bug will be created to move codemirror into an inc file at latest version Test plan as before Signed-off-by: Nick Clemens <nick@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #36 from Nick Clemens <nick@bywatersolutions.com> --- Created attachment 150731 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=150731&action=edit Bug 32721: Highlight the branch specific option from the global syspref Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #37 from Nick Clemens <nick@bywatersolutions.com> --- Created attachment 150732 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=150732&action=edit Bug 32721: (QA follow-up) Add exec flag to DB update and expand tests Added tests for case of no branch specific settings and when no branch passed Signed-off-by: Nick Clemens <nick@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #38 from Nick Clemens <nick@bywatersolutions.com> --- One question: You add the fields to the api, do we want them? They feel like they may be somewhat Koha specific, not needed for outside connections? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #39 from Nick Clemens <nick@bywatersolutions.com> --- One more question: should these be 'opacuserjs' and 'opacusercss' in the case of implementing the same feature in the staff client? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|Allow UserCSS and UserJS at |Allow specifying UserCSS |library level |and UserJS at library level | |for the OPAC -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #40 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Comment on attachment 150728 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=150728 Bug 32721: Tidy up - duplicate fetching of userjs and css Review of attachment 150728: --> (https://bugs.koha-community.org/bugzilla3/page.cgi?id=splinter.html&bug=32721&attachment=150728) ----------------------------------------------------------------- ::: C4/Auth.pm @@ +1364,5 @@
+ OpacCloud => C4::Context->preference("OpacCloud"), + OpacTopissue => C4::Context->preference("OpacTopissue"), + OpacAuthorities => C4::Context->preference("OpacAuthorities"), + OpacBrowser => C4::Context->preference("OpacBrowser"), + TagsEnabled => C4::Context->preference("TagsEnabled"),
Were these deliberately added.. they feel like a rebase mistake to me? -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #41 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- (In reply to Nick Clemens from comment #38)
One question: You add the fields to the api, do we want them? They feel like they may be somewhat Koha specific, not needed for outside connections?
Hmm, I agree.. we perhaps don't need to add them in.. instead we could map them to undef to drop them in API responses -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #42 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- (In reply to Nick Clemens from comment #39)
One more question: should these be 'opacuserjs' and 'opacusercss' in the case of implementing the same feature in the staff client?
You're probably right there too -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |ASSIGNED -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #150732|0 |1 is obsolete| | --- Comment #43 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 150754 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=150754&action=edit Bug 32721: (QA follow-up) Add exec flag to DB update and expand tests Added tests for case of no branch specific settings and when no branch passed Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #44 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 150755 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=150755&action=edit Bug 32721: (QA follow-up) Drop fields from API response Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #45 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 150756 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=150756&action=edit Bug 32721: (QA follow-up) Rename fields to opac* This patch updates the field names to reflect that they're OPAC related. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #46 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 150757 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=150757&action=edit Bug 32721: DBIC Schema update Update after field change -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #47 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 150758 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=150758&action=edit Bug 32721: (QA follow-up) Fix rebase errors We let some superflous template params creep back in during a rebase somewhere. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- QA Contact|testopia@bugs.koha-communit |nick@bywatersolutions.com |y.org | Status|ASSIGNED |Passed QA --- Comment #48 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Matt's on leave at the minute, so I took care of the thoughts raised by Nick.. They all made sense to me. Back to PQA -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #49 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Thanks Martin and Nick! -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 David Cook <dcook@prosentient.com.au> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dcook@prosentient.com.au --- Comment #50 from David Cook <dcook@prosentient.com.au> --- +1 for UserCSS but I'm thinking that we might want to start killing off UserJS... -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |34464 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |34536 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |34537 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |fridolin.somers@biblibre.co | |m -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Patch doesn't apply CC| |tomascohen@gmail.com --- Comment #51 from Tomás Cohen Arazi <tomascohen@gmail.com> --- Please, rebase ASAP. - Squash the patches as appropriate. - Leave the DBIC schema update as a single/separate commit we can drop if it doesn't apply due to later changes -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #150724|0 |1 is obsolete| | Attachment #150725|0 |1 is obsolete| | Attachment #150726|0 |1 is obsolete| | Attachment #150727|0 |1 is obsolete| | Attachment #150728|0 |1 is obsolete| | Attachment #150729|0 |1 is obsolete| | Attachment #150730|0 |1 is obsolete| | Attachment #150731|0 |1 is obsolete| | Attachment #150754|0 |1 is obsolete| | Attachment #150755|0 |1 is obsolete| | Attachment #150756|0 |1 is obsolete| | Attachment #150757|0 |1 is obsolete| | Attachment #150758|0 |1 is obsolete| | --- Comment #52 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 156157 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=156157&action=edit Bug 32721: Add branch specific userjs and usercss This patch allows for branch specific userJS and userCSS to be added through the libraries table. This works in conjunction with the global UserJS and UserCSS functionality and allows for multiple OPACs with different css and js options. Test plan: 1) Add to apache conf (/etc/apache2/sites-available/kohadev.conf) SetEnv OPAC_BRANCH_DEFAULT "FFL" RequestHeader add X-Koha-SetEnv "OPAC_BRANCH_DEFAULT FFL" 2) In the container, run restart_all 3) Navigate to the OPACUserJS and OPACUserCSS system preferences and add the following: OPACUserJS - console.log('Hello from global sysprefs');, OPACUserCSS - 'body { background-color: black; }' 4) Refresh the OPAC and the background should be black and the message should be logged to the console in developer tools 5) Navigate to Administration > Libraries 6) On the Fairfield branch (if this does not exist you will need to create a branch with a code matching the code that you added to the apache conf file), click edit 7) At the bottom there should be two fields to add userjs and usercss, complete with Codemirror syntax checking 8) In userjs add console.log('Hello from branch level'); and in usercss add 'body { background-color: blue; } then save 9) Return to the OPAC and refresh 10) If you are logged out of the OPAC it should now be logging both the message from global and from the branch level and the background should be blue (if not you will need to log out) 11) Log back into the OPAC using a user that DOES NOT have a default branch matching the branch you added to the Apache conf 12) The OPAC should now revert to only showing the global message in the console with a black background Sponsored-by: PTFS Europe Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #53 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 156158 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=156158&action=edit Bug 32721: Database update to add userjs and usercss to branches table This patch adds the columns for userjs and usercss to the branches table Test plan as per previous commit Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #54 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 156159 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=156159&action=edit Bug 32721: DBIC Schema This commit adds the DBIC Schema for the database change Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Bug 32721: DBIC Schema update Update after field change -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #55 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 156160 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=156160&action=edit Bug 32721: Add unit tests Unit tests to test two new functions: GetBranchSpecificJS and GetBranchSpecificCSS Test plan: 1) In the shell run prove -t t/db_dependent/Template/Plugin/Branches.t Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #56 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 156161 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=156161&action=edit Bug 32721: (QA follow up) - fix QA issues This patches addresses issues raised by the QA tests. It also adds a missed import of the Branches file in the document head Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Bug 32721: (QA follow-up) Add missing imports Missing imports added in three template files Exec flag added to atomic update file Tinymce imports removed A new bug will be created to move codemirror into an inc file at latest version Test plan as before Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Bug 32721: Tidy up - duplicate fetching of userjs and css Currently UserJS and UserCSS is injected into the template as a parameter through Auth.pm but is then fetched using Koha.Preference() in the template. This patch tidies this up by removing the parameters from Auth.pm Test plan as per first commit Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #57 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 156162 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=156162&action=edit Bug 32721: Highlight the branch specific option from the global syspref Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #58 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 156163 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=156163&action=edit Bug 32721: (QA follow-up) Add exec flag to DB update and expand tests Added tests for case of no branch specific settings and when no branch passed Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #59 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 156164 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=156164&action=edit Bug 32721: (QA follow-up) Drop fields from API response Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Bug 32721: (QA follow-up) Rename fields to opac* This patch updates the field names to reflect that they're OPAC related. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Bug 32721: (QA follow-up) Fix rebase errors We let some superflous template params creep back in during a rebase somewhere. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Passed QA --- Comment #60 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Rebased DBIC left in a separate commit and patches squashed where appropriate -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #61 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- *** Bug 20320 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |In Discussion --- Comment #62 from Tomás Cohen Arazi <tomascohen@gmail.com> --- The last follow-up contains this change which doesn't seem correct: +++ b/C4/Auth.pm @@ -1372,14 +1372,6 @@ sub checkauth { OpacFavicon => C4::Context->preference("OpacFavicon"), opacreadinghistory => C4::Context->preference("opacreadinghistory"), opaclanguagesdisplay => C4::Context->preference("opaclanguagesdisplay"), - opacbookbag => "" . C4::Context->preference("opacbookbag"), - OpacCloud => C4::Context->preference("OpacCloud"), - OpacTopissue => C4::Context->preference("OpacTopissue"), - OpacAuthorities => C4::Context->preference("OpacAuthorities"), - OpacBrowser => C4::Context->preference("OpacBrowser"), - TagsEnabled => C4::Context->preference("TagsEnabled"), - OPACUserJS => C4::Context->preference("OPACUserJS"), - OPACUserCSS => C4::Context->preference("OPACUserCSS"), intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"), intranetstylesheet => C4::Context->preference("intranetstylesheet"), IntranetNav => C4::Context->preference("IntranetNav"), I still think we should've implemented bug 26129, and use it for this cases. But I abandoned it so I won't block this. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #156164|0 |1 is obsolete| | --- Comment #63 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 157335 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=157335&action=edit Bug 32721: (QA follow-up) Drop fields from API response Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Bug 32721: (QA follow-up) Rename fields to opac* This patch updates the field names to reflect that they're OPAC related. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Bug 32721: (QA follow-up) Fix rebase errors We let some superflous template params creep back in during a rebase somewhere. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|In Discussion |Passed QA --- Comment #64 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Just fixed that commit to only remove OPACUserJS and OPACUserCSS - should be good to go now -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Version(s)| |23.11.00 released in| | Status|Passed QA |Pushed to master -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #65 from Tomás Cohen Arazi <tomascohen@gmail.com> --- Pushed to master for 23.11. Nice work everyone, thanks! -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to master |Needs documenting --- Comment #66 from Fridolin Somers <fridolin.somers@biblibre.com> --- Enhancement not pushed to 23.05.x -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Text to go in the| |One can now add CSS and JS release notes| |in library edition. | |This | |works in conjunction with | |the global 'UserJS' and | |'UserCSS' functionality and | |allows for multiple OPACs | |with different CSS and JS | |options. --- Comment #67 from Fridolin Somers <fridolin.somers@biblibre.com> --- I add a release note, feel free to modify -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Text to go in the|One can now add CSS and JS |With this feature it's release notes|in library edition. |possible to add library |This |specific CSS and JavaScript |works in conjunction with |on the library |the global 'UserJS' and |administration pages. |'UserCSS' functionality and |This |allows for multiple OPACs |works in combination with |with different CSS and JS |the global '*UserJS' and |options. |'*UserCSS' functionality | |and allows for multiple | |OPACs with different CSS | |and JavaScript | |customizations. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #68 from Fridolin Somers <fridolin.somers@biblibre.com> --- BTW : It would be nice to add library option to plugin hook adding JS and CSS, right ? Hook added by Bug 20181 Currently one can use, for OPAC, selector "body.branch-LIBRARY" -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #69 from Katrin Fischer <katrin.fischer@bsz-bw.de> ---
From the GUI it's not obvious that the new options are for the OPAC - was this intentional?
-- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |35530 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35530 [Bug 35530] Can't tell if UserCSS and UserJS in ibraries are for staff interface or OPAC -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 --- Comment #70 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- (In reply to Nick Clemens from comment #39)
One more question: should these be 'opacuserjs' and 'opacusercss' in the case of implementing the same feature in the staff client?
It was not changed/updated in the end, I filed: Bug 35530 - Can't tell if UserCSS and UserJS in ibraries are for staff interface or OPAC -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|Needs documenting |RESOLVED Documentation| |https://gitlab.com/koha-com submission| |munity/koha-manual/-/merge_ | |requests/802 Documentation| |Caroline Cyr La Rose contact| | CC| |caroline.cyr-la-rose@inlibr | |o.com -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32721 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |36916 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=36916 [Bug 36916] TestBuilder generates incorrect JS and CSS for libraries -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon@bugs.koha-community.org