[koha-commits] main Koha release repository branch master updated. v3.20.00-24-g73d9706
Git repo owner
gitmaster at git.koha-community.org
Tue May 26 16:01:36 CEST 2015
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 73d9706667c3e1574c0b19009f4dc4e02c4c65e2 (commit)
via 7b0792584ef8d75073ce26c6f496abbe2e80bd9d (commit)
via 767edc6bb9385d63a2f5994e8ef0cfab329cfaca (commit)
via 9b1241ecfca68c104d9adbb5d05a7547b5761e17 (commit)
via a04e8a8bfcff1d6c8e09a98086f108fac76d6e2d (commit)
via 8554ce273cd24bcef738ebf76aeaa79db87403e1 (commit)
via 8b9a555cc9391b841472ca11a0f48edcd4819a2f (commit)
via 7fbc7467b53784b41e1ef2db7a95ed69235c9c5e (commit)
via e592536d97483b88dceabedfaec9fefcefbcda2f (commit)
via 09787ec8b09cf3cf90cb5d6ff96c77dc0d314c58 (commit)
via 2ee1a35dfa91892474a7d10f8783dd95edbe7696 (commit)
via d7dc11e61fea5dcc3f0087e46b6eee8d74c21c63 (commit)
via 4f994e8baf3ffd209f6a0a85993039f753ec6e32 (commit)
via fd14184873e707236150e368f39b19a6992760b8 (commit)
via 642e6012cd125cbc3aeaca83e1fd2430ce43fdb0 (commit)
via 8fdd352bc9bb4d0dd84ca0df33b51558ee765ea1 (commit)
via cd96c1c81ff408e53e47fe87dc114099452ec051 (commit)
via 7a57eb56578ed3a455c383f1c3642a8db9b937e3 (commit)
via 0c58b58a313e81bf844685b62fa9997d43817816 (commit)
from 9381c95dc3fe4fce53cd45f2526b752a36a1e3a2 (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 73d9706667c3e1574c0b19009f4dc4e02c4c65e2
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Tue May 26 10:59:54 2015 -0300
Bug 12160: DBRev 3.21.00.002
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 7b0792584ef8d75073ce26c6f496abbe2e80bd9d
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Apr 27 16:06:37 2015 +0200
Bug 12160: Rename opacuserjs with OPACUserJS
Test plan:
Same as previous patch for opacuserjs
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
NOTE: Worked before and after updatedatabase.pl, though after
is less confusing to the programmer unaware of case-insensitivity.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 767edc6bb9385d63a2f5994e8ef0cfab329cfaca
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Apr 27 15:55:31 2015 +0200
Bug 12160: Rename intranetuserjs with IntranetUserJS
To match IntranetUserCSS, intranetuserjs should be renamed
IntranetUserJS.
Test plan:
1/ Be sure there is no occurrence of intranetuserjs
2/ Confirm the pref still works as before
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
NOTE: Worked before and after updatedatabase.pl, though after
is less confusing to the person unaware of case insensitivity.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 9b1241ecfca68c104d9adbb5d05a7547b5761e17
Author: Magnus Enger <magnus at enger.priv.no>
Date: Wed Apr 29 21:28:50 2015 +0200
Bug 14025: Fix 865u-links in the OPAC for NORMARC
The display of links found in 856$u for NORMARC has not been keeping up with
the one for MARC21, and several sysprefs have not been implemented. This
patch tries to fix that.
Affected sysprefs:
- OPACURLOpenInNewWindow
- URLLinkText
- OPACDisplay856uAsImage
- OPACTrackClicks
To test:
- Make sure you have a record with a URL in 856$u and marcflavor = NORMARC.
(It does not have to be a full NORMARC setup or a NORMARC record, just make
sure you are viewing the record through the NORMARC XSLT files.)
- View the record both in a result list and in detail view
- Check that the 4 involved sysprefs affect the display in the expected ways
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Tested on NORMARC setup and XSLTs
Works as described, each syspref works
No koha-qa errors
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Since it only affects NORMAC, I trust in Magnus :)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit a04e8a8bfcff1d6c8e09a98086f108fac76d6e2d
Author: Mason James <mtj at kohaaloha.com>
Date: Wed Jun 27 02:41:20 2012 +1200
Bug 6679: Fix 3 perlcritic violations in C4/Record.pm
Expression form of "eval" at line 358, column 5. See page 161 of PBP. (Severity: 5)
Expression form of "eval" at line 367, column 5. See page 161 of PBP. (Severity: 5)
Expression form of "eval" at line 510, column 3. See page 161 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Fixed conflict
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 8554ce273cd24bcef738ebf76aeaa79db87403e1
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Dec 9 09:48:58 2014 +0100
Bug 6679: (follow-up) fix 9 perlcritic violations in C4/TmplTokenType.pm
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 8b9a555cc9391b841472ca11a0f48edcd4819a2f
Author: Mason James <mtj at kohaaloha.com>
Date: Tue Sep 25 11:21:43 2012 +1200
Bug 6679: Fixing code so it passes basic Perl:::Critic tests
opac/ilsdi.pl: Stricture disabled at line 217, column 17. See page 429 of PBP. (Severity: 5)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 7fbc7467b53784b41e1ef2db7a95ed69235c9c5e
Author: Mason James <mtj at kohaaloha.com>
Date: Wed Jun 27 05:07:46 2012 +1200
Bug 6679: Fix 2 perlcritic violations in C4/Installer/PerlModules.pm
Expression form of "eval" at line 71, column 9. See page 161 of PBP. (Severity: 5)
Expression form of "eval" at line 85, column 13. See page 161 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit e592536d97483b88dceabedfaec9fefcefbcda2f
Author: Mason James <mtj at kohaaloha.com>
Date: Wed Jun 27 01:50:33 2012 +1200
Bug 6679: Fix 6 perlcritic violations in C4/Reports/Guided.pm
- Subroutine prototypes used at line 376, column 1. See page 194 of PBP. (Severity: 5)
- Bareword file handle opened at line 757, column 2. See pages 202,204 of PBP. (Severity: 5)
- Two-argument "open" used at line 757, column 2. See page 207 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 09787ec8b09cf3cf90cb5d6ff96c77dc0d314c58
Author: Mason James <mtj at kohaaloha.com>
Date: Wed Jun 27 01:08:34 2012 +1200
Bug 6679: Fix 9 perlcritic violations in C4/TmplTokenType.pm
- Subroutine prototypes used at line 86, column 1. See page 194 of PBP. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 2ee1a35dfa91892474a7d10f8783dd95edbe7696
Author: Mason James <mtj at kohaaloha.com>
Date: Wed Jun 27 01:04:36 2012 +1200
Bug 6679: Fix 11 perlcritic violations in C4/Dates.pm
- Subroutine prototypes used at line 82, column 1. See page 194 of PBP. (Severity: 5)
- "return" statement with explicit "undef" at line 102, column 28. See page 199 of PBP. (Severity: 5)
- Expression form of "eval" at line 108, column 20. See page 161 of PBP. (Severity: 5)
- Variable declared in conditional statement at line 126, column 5. Declare variables outside of the condition. (Severity: 5)
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit d7dc11e61fea5dcc3f0087e46b6eee8d74c21c63
Author: Indranil Das Gupta <indradg at gmail.com>
Date: Fri May 15 01:12:11 2015 +0530
Bug 14203: Message for non-existent lang removal
A trivial string patch to update the error message displayed to
user if koha-translate is used to attempt removal of a language
that is not installed.
Test plan
=========
1/ attempt to remove a non-existent language by
<installdir>/debian/scripts/koha-translate --remove <langcode>
2/ it should show "Error: the selected language is not already
installed."
3/ apply patch
4/ repeat step 1; it should show "Error: the selected language is
not installed."
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 4f994e8baf3ffd209f6a0a85993039f753ec6e32
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Tue May 12 02:08:17 2015 +0000
Bug 14184: Undefined $term causes noisy warns in C4/CourseReserves.pm
This patch sets $term to be an empty string.
Test plan
=========
1/ enable 'UseCourseReserves' syspref in Circulation preferences
2/ in a terminal, run a `tail -f ` on your instance's opac-error.log
3/ go to the opac, click on 'Course reserve' tab to go to
opac-course-reserves.pl
4/ notice the warning - "opac-course-reserves.pl: Use of uninitialized
value $term" appear in the `tail`ed opac-error.log
5/ apply the patch
6/ reload the page (opac-course-reserves.pl)
7/ page works but the warning in step #4 is no longer logged
8/ run qa test (i.e. koha-qa.pl -c 1 -v 2), there should be no error
Remarks: Testing result match expected test plan output. The QA tests
pass with "OK" for the commit.
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit fd14184873e707236150e368f39b19a6992760b8
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Tue May 12 03:01:35 2015 +0000
Bug 14185: Undefined $limit causes warn in opac/opac-readingrecord.pl
This patch sets $limit to be an empty string.
Test plan
=========
1/ login into the opac using your user account credentials
2/ in a terminal, run a `tail -f ` on your instance's opac-error.log
3/ go back to the opac, click on 'your reading history' tab to go to
opac-readingrecord.pl
4/ notice the warning - "opac-readingrecord.pl: Use of uninitialized
value $limit" appear in the `tail`ed opac-error.log
5/ apply the patch
6/ reload the page (opac-readingrecord.pl)
7/ page works but the warning in step #4 is no longer logged
8/ run qa test (i.e. koha-qa.pl -c 1 -v 2), there should be no error
Remarks: Testing result match expected test plan output. The QA tests
pass with "OK" for the commit.
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 642e6012cd125cbc3aeaca83e1fd2430ce43fdb0
Author: Indranil Das Gupta <indradg at gmail.com>
Date: Thu May 14 07:23:16 2015 +0530
Bug 14186 [QA Followup]: Undefined $reservedfor causes warn in opac-reserve.pl
This is a followup for Bug 14186 that removes the extraneous tab
char on line 470, so that the patch can clear QA tools.
This patch sets $reservedfor to an empty string.
Test plan
=========
1/ in a terminal, run `tail -f ` on your instance's opac-error.log
2/ go to the opac and search from an item that exists on the Koha
instance.
3/ Select the title (if more than one title is returned) and click on
'Place hold' link to go to opac-reserve.pl
4/ notice the warning - "opac-reserve.pl: Use of uninitialized value
$reservedfor" appear in the `tail`ed opac-error.log
5/ apply the patch
6/ reload the page (opac-reserve.pl)
7/ page works but the warning in step #4 is no longer thrown up
8/ run qa test (i.e. koha-qa.pl -c 1 -v 2), there should be no error
Remarks: Testing result match expected test plan output. The QA tests
pass with "OK" for the commit.
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 8fdd352bc9bb4d0dd84ca0df33b51558ee765ea1
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Tue May 12 03:30:46 2015 +0000
Bug 14186: Undefined $reservedfor causes warn in opac-reserve.pl
This patch sets $reservedfor to an empty string.
Test plan
=========
1/ in a terminal, run `tail -f ` on your instance's opac-error.log
2/ go to the opac and search from an item that exists on the Koha
instance.
3/ Select the title (if more than one title is returned) and click on
'Place hold' link to go to opac-reserve.pl
4/ notice the warning - "opac-reserve.pl: Use of uninitialized value
$reservedfor" appear in the `tail`ed opac-error.log
5/ apply the patch
6/ reload the page (opac-reserve.pl)
7/ page works but the warning in step #4 is no longer thrown up
8/ run qa test (i.e. koha-qa.pl -c 1 -v 2), there should be no error
Remarks: The QA test failed - "forbidden pattern: tab char (line 470)".
Marking this as 'FAILED QA'
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit cd96c1c81ff408e53e47fe87dc114099452ec051
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Sun May 24 16:41:57 2015 +1200
Bug 14262: change the build-git-snapshot version to 3.21
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 7a57eb56578ed3a455c383f1c3642a8db9b937e3
Author: Liz Rea <liz at catalyst.net.nz>
Date: Fri May 22 15:23:31 2015 +1200
Bug 14255: minor edits to history.txt to facilitate automatic updates to the website
All this really does is remove whitespace at the end of the lines, and correct a weirdly tabbed entry. There aren't any content changes.
To test:
Just have a look at the patch and see that it's done those things. Not sure much needs to be done.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 0c58b58a313e81bf844685b62fa9997d43817816
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Tue May 26 10:41:30 2015 -0300
DBRev 3.21.00.000: El tiempo vuela
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 8 +--
C4/CourseReserves.pm | 1 +
C4/Dates.pm | 24 ++++-----
C4/Installer/PerlModules.pm | 4 +-
C4/Record.pm | 6 +--
C4/Reports/Guided.pm | 2 +-
C4/TmplToken.pm | 2 +-
C4/TmplTokenType.pm | 18 +++----
Koha.pm | 2 +-
debian/build-git-snapshot | 2 +-
debian/scripts/koha-translate | 2 +-
docs/history.txt | 32 ++++++------
installer/data/mysql/sysprefs.sql | 4 +-
installer/data/mysql/updatedatabase.pl | 24 +++++++++
.../prog/en/includes/doc-head-close.inc | 4 +-
.../prog/en/modules/admin/preferences/opac.pref | 2 +-
.../en/modules/admin/preferences/staff_client.pref | 2 +-
.../prog/en/modules/labels/spinelabel-print.tt | 4 +-
.../bootstrap/en/includes/opac-bottom.inc | 4 +-
.../bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl | 52 +++++++++++++++-----
.../bootstrap/en/xslt/NORMARCslim2OPACResults.xsl | 50 +++++++++++++++++++
opac/ilsdi.pl | 9 ++--
opac/opac-readingrecord.pl | 1 +
opac/opac-reserve.pl | 1 +
24 files changed, 182 insertions(+), 78 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list