[koha-commits] main Koha release repository branch master updated. v16.05.00-184-g54451b6
Git repo owner
gitmaster at git.koha-community.org
Fri Jun 24 15:31:47 CEST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, master has been updated
via 54451b66a15e7b1808001c8a8fdaef10194ed685 (commit)
via 609f5371288d2876b52cd086aeabf5e07ae08537 (commit)
via add61ef614d171dbc4ecda95ec8cfb70a1ad40a0 (commit)
via 04143f6a9cf2247d8c3db9da2f492f311dc753ec (commit)
via e0911b0c4c11e894bb7303c4afb8324942887af1 (commit)
from 602246306a1b33f73e22556f3744d7f72cac377a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 54451b66a15e7b1808001c8a8fdaef10194ed685
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Jun 24 13:32:35 2016 +0000
Bug 15485 - DBRev 16.06.00.004
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 609f5371288d2876b52cd086aeabf5e07ae08537
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Jun 22 14:52:03 2016 -0300
Bug 15485: (QA followup) Simplify logic and use *ResultsDisplay value during upgrade
This patch makes the new sysprefs work as the previously defined. Instead of falling back
to what *ResultsDisplay is set, it now has its own 'default' (that still defaults to the
*Results*.xslt).
The default values are set to 'default' as the rest of XSLT-related sysprefs, and the upgrade
picks whatever is set in OPACXSLTResultsDisplay and XSLTResultsDisplay so current behaviour
is preserved.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
New XSLTs for Lists work as advertised
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit add61ef614d171dbc4ecda95ec8cfb70a1ad40a0
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Jun 14 13:16:13 2016 -0300
Bug 15485: (QA followup) Fix behaviour and default values
Jonathan noticed the current behaviour is that the lists rendering
falls back to the XSLTResults, and if not defined (i.e. != 'default' and
!= some_path) it falls back to a legacy display (non-XSLT).
The patchset changed this behaviour because 'default' is not a valid value
for the lists. So it should fallback to the current behaivour (i.e. Results
XSLT configuration) if not defined. This patch fixes this by adding
|| C4::Context->preference('XSLTResultsDisplay')
(and the OPAC counterpart).
It also fixes minor glitches on the update message (oops) and bad default value
in sysprefs.sql for 'XSLTListsDisplay'.
Thanks Jonathan!
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 04143f6a9cf2247d8c3db9da2f492f311dc753ec
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Jun 7 23:58:38 2016 -0300
Bug 15485: Use lists-specific XSLT sysprefs
This patch makes the shelves.pl (staff) and opac-shelves.pl scripts
use the new sysprefs for specifying custom XSLTs for lists display.
XSLT.pm is patched so it defaults to the corresponding *Results.xsl
files if none is specified.
To test:
- Create a list
- Open the list in the staff interface
- On a new tab, open the list in the OPAC.
- Apply this patches
=== default behaviour
- Open the list (both opac and staff) on new tabs
=> SUCCESS: They look exactly the same (hint: the syspref is set to ''
so it should fallback to using the one we were using.
=== using the new functionality
- Create custom XSLTs for lists, for example:
$ cd /home/vagrant/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/xslt
$ cp MARC21slim2OPACResults.xsl MARC21slim2OPACLists.xsl
- Edit your sysprefs, setting OPACXSLTListsDisplay to:
/home/vagrant/kohaclone/koha-tmpl/opac-tmpl/bootstrap/{langcode}/xslt/MARC21slim2OPACLists.xsl
- Reload the OPAC list view
=> SUCCESS: Looks exactly as before
- Make some minor tweak (for example in line 423 replace
<xsl:text> </xsl:text>
for
<xsl:text> BLAH </xsl:text>
- Reload the list
=> SUCCESS: BLAH shows in several places on the title.
- Repeat for the staff interface
- Sign off :-D
So we can now set custom XSLTs for lists.
Sponsored-by: Carnegie Stout Library
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Deb Stephenson <DStephen at dubuque.lib.ia.us>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit e0911b0c4c11e894bb7303c4afb8324942887af1
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Jun 7 23:55:25 2016 -0300
Bug 15485: Introduce new sysprefs for lists XSLTs
This patch introduces two new sysprefs, allowing the users to
set custom XSLTs for lists display. This is done almost the usual
way.
If none is specified (value='') it defaults to the current behaviour:
using the *Results.xsl file for the corresponding interface.
Sponsored-by: Carnegie Stout Library
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Deb Stephenson <DStephen at dubuque.lib.ia.us>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/XSLT.pm | 12 ++++++++++++
Koha.pm | 2 +-
installer/data/mysql/sysprefs.sql | 2 ++
installer/data/mysql/updatedatabase.pl | 18 ++++++++++++++++++
.../prog/en/modules/admin/preferences/opac.pref | 5 +++++
.../en/modules/admin/preferences/staff_client.pref | 5 +++++
opac/opac-shelves.pl | 5 +++--
virtualshelves/shelves.pl | 4 ++--
8 files changed, 48 insertions(+), 5 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list