[koha-commits] main Koha release repository branch master updated. v3.16.00-630-g6246f2c
Git repo owner
gitmaster at git.koha-community.org
Tue Sep 23 20:47:24 CEST 2014
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 6246f2c70049baf86bc942c2473793c83057a64f (commit)
via b2839a7c9c8554097bd36de0ad439967e2035c5c (commit)
via 3f2dda2f3380b341bd9575d5626cdb9ac8889191 (commit)
via b04f5ba8a0071609f756e96c50b0cad19780f3e2 (commit)
via 04857ed68eff319f4b7b42508aeee8a240bde995 (commit)
via 2bd151fab5c673a35ce06e511ae1f4b97513539f (commit)
via 70c0b8280bdaf9901eadb93133a52c891fbbd0d7 (commit)
from 2d4d3d1bf511bc277e1f05e34d0857cb98b9924c (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 6246f2c70049baf86bc942c2473793c83057a64f
Author: Marc Véron <veron at veron.ch>
Date: Fri Jul 25 23:57:54 2014 +0200
Bug 12162 - Add class="branchcode" to body tag to make OPAC CSS-styleable per branch
This patch adds a branch sepecific class to all OPAC pages.
Example:
If not logged in, opac-main.pl displays:
<body ID="opac-main" class="branch-default" >
If logged in at branch FFL, it displays:
<body ID="opac-main" class="branch-FFL" >
If you log in, opac-user.pl should display
<body ID="opac-user" class="branch-FFL scrollto" >
To test:
1)
Apply patch.
2)
Add to syspref OPACUserCSS something highly visible, e.g. for branch FFL:
.branch-FFL {
background-color: yellow;
border: 10px solid red;
}
3)
Go to OPAC and login in with a user with home branch FFL
4)
Verify that colors change as appropriate.
5)
Log out. Verify that colors display as before or as defined in class branch-default in OPACUserCSS
6)
Display patch in patch diff view, verify that ids and classes in body tag are consistent with params bodyid and bodyclass in INCLUDE line
7)
Search for regressions
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit b2839a7c9c8554097bd36de0ad439967e2035c5c
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Wed Aug 27 10:11:28 2014 -0300
Bug 11672: (followup) warnings tested
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 3f2dda2f3380b341bd9575d5626cdb9ac8889191
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Sun Aug 24 02:11:50 2014 -0300
Bug 11672: Untranslatable dropdown on Guided Reports and dictionary
This patch removes hardcoded descriptions and sets them in the templates
using the variable content as id.
To test, create a new guided report and verify the 'module to report on' dropdown
shows as usual [1]. Functionality shouldn't get changed.
The patch also changes the dictionary pages where 'area' should be displayed/selectable
with the same strings as the guided reports. Try all the possible disctionary pages.
The last page when creating a dictionary now shows the 'area description' instead of the
code. The same happens to the dictionary list once you have dictionaries saved.
[1] The following texts get changed:
Catalogue -> Catalog
Acquisition -> Acquisitions
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit b04f5ba8a0071609f756e96c50b0cad19780f3e2
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Sun Aug 24 02:21:52 2014 -0300
Bug 11672: (regression test) get_report_areas gets tested
This patch introduces a unit test for the new get_report_areas functionality.
To try it, run
$ prove t/db_dependent/Reports_Guided.t
It is expected to have 16 tests defined, and to fail the introduced one
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 04857ed68eff319f4b7b42508aeee8a240bde995
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Thu Apr 17 16:07:20 2014 +0100
Bug 11633 Return Correct status if patron blocked by fines
If the patron has amassed charges that block borrowing, but we
allow staff override the information that the patron cannot
issue should be included the patron information response
This patch sets the appropriate status fields in the patron object
It restores the fee_limit member to the patron object
and calls a local subroutine to set it.
This could be done more elegantly but that would require more
major refactoring of the rather messy initializer code
in ILS::Patron
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 2bd151fab5c673a35ce06e511ae1f4b97513539f
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Thu Apr 17 15:55:03 2014 +0100
Bug 11633 : Block Issue if fines require staff override
If a patrons fines exceed noissuescharge and we allow
staff to allow issue at their discretion via an override
the SIP process allowed charges to go ahead.
This patch closes the loophole which allowed self issue
to subvert the usual library loan policy
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 70c0b8280bdaf9901eadb93133a52c891fbbd0d7
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Sep 11 15:22:44 2014 +0200
Bug 7372: (follow-up) does execute this DB entry twice
Since this enh has been backported on 3.14, this patch should be applied
on 3.16 and master branch in order to update the updatedb entry.
It should not be executed twice otherwise the process is stuck on this
entry.
http://irc.koha-community.org/koha/2014-09-11#i_1567078
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Reports/Guided.pm | 6 +-
C4/SIP/ILS/Patron.pm | 18 +--
C4/SIP/ILS/Transaction/Checkout.pm | 4 +-
installer/data/mysql/updatedatabase.pl | 43 ++++---
.../prog/en/modules/reports/dictionary.tt | 129 +++++++++++---------
.../en/modules/reports/guided_reports_start.tt | 25 +++-
.../opac-tmpl/bootstrap/en/includes/bodytag.inc | 15 +++
.../bootstrap/en/modules/opac-ISBDdetail.tt | 4 +-
.../bootstrap/en/modules/opac-MARCdetail.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-account.tt | 1 +
.../bootstrap/en/modules/opac-addbybiblionumber.tt | 4 +-
.../bootstrap/en/modules/opac-advsearch.tt | 2 +-
.../bootstrap/en/modules/opac-alert-subscribe.tt | 4 +-
.../bootstrap/en/modules/opac-auth-MARCdetail.tt | 4 +-
.../bootstrap/en/modules/opac-auth-detail.tt | 4 +-
.../opac-tmpl/bootstrap/en/modules/opac-auth.tt | 2 +-
.../bootstrap/en/modules/opac-authorities-home.tt | 4 +-
.../en/modules/opac-authoritiessearchresultlist.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-basket.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-blocked.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-browser.tt | 4 +-
.../bootstrap/en/modules/opac-course-details.tt | 4 +-
.../bootstrap/en/modules/opac-course-reserves.tt | 4 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +-
.../bootstrap/en/modules/opac-downloadcart.tt | 2 +-
.../bootstrap/en/modules/opac-downloadshelf.tt | 4 +-
.../en/modules/opac-full-serial-issues.tt | 4 +-
.../bootstrap/en/modules/opac-imageviewer.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-main.tt | 2 +-
.../modules/opac-memberentry-update-submitted.tt | 2 +-
.../bootstrap/en/modules/opac-memberentry.tt | 2 +-
.../bootstrap/en/modules/opac-messaging.tt | 2 +-
.../bootstrap/en/modules/opac-overdrive-search.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-passwd.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-privacy.tt | 2 +-
.../bootstrap/en/modules/opac-readingrecord.tt | 2 +-
.../en/modules/opac-registration-confirmation.tt | 4 +-
.../en/modules/opac-registration-email-sent.tt | 4 +-
.../en/modules/opac-registration-invalid.tt | 4 +-
.../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 2 +-
.../bootstrap/en/modules/opac-results-grouped.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-review.tt | 2 +-
.../bootstrap/en/modules/opac-search-history.tt | 2 +-
.../bootstrap/en/modules/opac-sendbasketform.tt | 2 +-
.../bootstrap/en/modules/opac-sendshelfform.tt | 2 +-
.../bootstrap/en/modules/opac-serial-issues.tt | 2 +-
.../bootstrap/en/modules/opac-shareshelf.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +-
.../bootstrap/en/modules/opac-showmarc.tt | 2 +-
.../bootstrap/en/modules/opac-showreviews.tt | 4 +-
.../bootstrap/en/modules/opac-suggestions.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-tags.tt | 2 +-
.../bootstrap/en/modules/opac-tags_subject.tt | 2 +-
.../bootstrap/en/modules/opac-topissues.tt | 4 +-
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 2 +-
reports/dictionary.pl | 17 +--
reports/guided_reports.pl | 7 +-
t/db_dependent/Reports_Guided.t | 32 +++--
59 files changed, 250 insertions(+), 175 deletions(-)
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/bodytag.inc
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list