[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.05-13-g736fcd1
Git repo owner
gitmaster at git.koha-community.org
Fri Oct 26 14:31:31 CEST 2018
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, 18.05.x has been updated
via 736fcd1cb62413f6b2de3e3190da4edbe67e09a3 (commit)
via 4b290f45cc15182afe5b5d6ddda9b2a5948de4d8 (commit)
via ab630ab84f2f40145c24664a72da8bc0817cac66 (commit)
via c82207ebb5487660e70c7091195d67be4b434139 (commit)
via 325ebd2a7da2362b69b82587d01865906ea735ca (commit)
via 2cae3d86bd64ed39d4963b549583c7f514b3f9ad (commit)
via bb14c23343f08d578de4a813299bdd5e1277eff3 (commit)
from 220fcd92adcc08c86caeb221cca7e4a25992324c (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 736fcd1cb62413f6b2de3e3190da4edbe67e09a3
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jun 16 09:28:01 2016 -0400
Bug 16754: Use validation plugin in budgets, planning, and contracts
This patch removes the custom javascript form validation from three
templates: Budgets, budget planning, and contracts. Validation via the
validation plugin is done instead.
This patch also removes use of event attributes like onclick and
onchange. Also changed: I added the "Required" text next to required
fields as necessary.
To test, apply the patch and go to Administration -> Budgets.
- Test the budget creation process for adding, editing, and duplicating
budgets. In all cases:
- The start date and end date should be required
- You should be warned if you enter an end date which falls before the
start date.
- The description should be required
- The budget amount should be required to be a number
To test the budget planning page:
Note that much of the JS removed from this template was unused. It
looked for inputs by the name 'est_total' which don't exist.
- When viewing the table of funds for a budget, select a choice from the
'planning' toolbar menu.
- Verify that after entering a numeric value in any cell, the
'remaning' value at the end of the row is correctly updated.
- Verify that after entering non-numeric data an error is displayed.
- Verify that clicking the 'auto-fill' button at the end of the row
works to fill any empty or zero-value fields with the remaning funds
available.
To test the vendor contracts page:
- Go to Acquisitions -> Vendor -> Contracts
- Add or edit a contract
- Confirm that name, start date, and end date are required.
- Confirm that you are warned if you enter an end date which falls
before the start date.
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 23265158fcab25f8f5188cea6f07af46812d41cc)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4b290f45cc15182afe5b5d6ddda9b2a5948de4d8
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Oct 16 17:09:29 2018 +0000
Bug 21583: Don't use Asset.js for external script files
To test:
1 - Enable Novelist in staff client:
NovelistSelectStaffEnabled: Add
NovelistSelectStaffProfile: anything
NovelistSelectPassword: anything
( these don't need to be valid, just not blank )
2 - Pull up a record detail page in staff client
3 - View page source - search for ns2init.js
4 - You won't find it
5 - Apply patch
6 - Reload details
7 - Search page source for ns2init.js
8 - It loaded! Huzzah!
Signed-off-by: George Williams <george at nekls.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 55225ba10b824f7e881738a20c751200843d3ec9)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit ab630ab84f2f40145c24664a72da8bc0817cac66
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Oct 16 14:00:59 2018 +0000
Bug 21579: Make showdiffmarc.pl work for authorities and biblios
To test:
1 - Have or make some authority records
2 - Have or make an authority matching rule
3 - Export your authrotities
4 - Import them using the matching rule
5 - On the 'Manage staged records' page view some diffs
6 - The import record is correct, but the existing records pull form
bibs
7 - Apply patch
8 - Repeat
9 - Confirm you see the expected authority matches
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Marjorie Vila <marjorie.barry-vila at collecto.ca>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 7f0207d2ad162a86cf5e09e437565b66b91c5004)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit c82207ebb5487660e70c7091195d67be4b434139
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 16 10:27:37 2018 -0300
Bug 21155: Prevent SwitchOnSiteCheckouts.t to fail randomly
# Failed test 'The date_due should have been set depending on the circ
rules when the on-site checkout has been switched'
# at t/db_dependent/Circulation/SwitchOnSiteCheckouts.t line 126.
# got: '2018-10-16T23:59:00'
# expected: '2018-10-21T23:59:00'
TestBuilder set date to today, so issuingrules.harduedate will be set to
today.
issuingrules.hardduedatecompare will be set to an integer.
If set to 0, $datedue will be reset to the hard due date
The call stack is: AddIssue > CalcDateDue > GetHardDueDate
In GetHardDueDate:
3509 if ( $hardduedatecompare == 0 || $hardduedatecompare == $cmp ) {
3510 $datedue = $hardduedate->clone;
3511 }
To fix this random failure we need to set issuingrules.harduedate to undef.
Test plan:
0. Do not apply this patch
1. Modify the test to set hardduedatecompare to 0 (search 'my $issuingrule = ')
2. Execute the test and confirm the failure
3. Apply this patch
4. Execute the test and confirm the it is no longer failing
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 4e6d9defc180204461f80477be287ade7fcfc11b)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 325ebd2a7da2362b69b82587d01865906ea735ca
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Tue Oct 9 12:22:35 2018 +0000
Bug 21552: Use raw filter for displaying RoutingListNote
The RoutingListNote system preference works like other prefs
allowing you to insert your own content on the routling list
template using HTML. The default text even uses HTML, so it
looks broken without this patch.
To test:
- Add a subscription
- Add a new routing list to it
- Add some patrons to it
- Save
- preview routing list
- Verify that the note shows and is formatted correctly.
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit f902041e244cc35ecc99e3ca256ff24c843a8b04)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2cae3d86bd64ed39d4963b549583c7f514b3f9ad
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Oct 26 12:32:20 2018 +0100
Bug 21351: Rename the Taiwanese language pack to use correct file name
The words "Han (Simplified variant)" is appearing in the language name
because the file is titled "zh-Hans-TW" when it should be titled
"zh-Hant-TW". The database is set up to use "Hant" but it just
incorrectly named.
Test plan
1. Apply patch.
2. Install zh-Hant-TW on your Koha server.
3. Navagate to I18N/L10N preferences and confirm that the english text description states (Traditional variant).
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Files on translate.kc.org have already been fixed by Bernardo.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit fd0df2ad55f9a5ff180dc0dfa22fede5f0ad37cd)
Converted to removal of files rather than rename as translation merges
had already created the new files as expected.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit bb14c23343f08d578de4a813299bdd5e1277eff3
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Oct 26 12:27:15 2018 +0100
Bug 21082: (RMaint follow-up) remove $raw filters
The $raw filter plugin is not available in 18.05.x series
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
.../intranet-tmpl/prog/en/includes/calendar.inc | 33 +
.../prog/en/modules/admin/aqbudgetperiods.tt | 114 +-
.../prog/en/modules/admin/aqcontract.tt | 75 +-
.../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 54 +-
.../prog/en/modules/admin/overdrive.tt | 5 +-
.../prog/en/modules/catalogue/detail.tt | 2 +-
.../en/modules/serials/routing-preview-slip.tt | 5 +-
.../prog/en/modules/tools/showdiffmarc.tt | 6 +-
misc/translator/po/zh-Hans-TW-marc-MARC21.po |18387 -------
misc/translator/po/zh-Hans-TW-marc-NORMARC.po | 2878 -
misc/translator/po/zh-Hans-TW-marc-UNIMARC.po |13156 -----
misc/translator/po/zh-Hans-TW-opac-bootstrap.po |12578 -----
misc/translator/po/zh-Hans-TW-pref.po | 8211 ---
misc/translator/po/zh-Hans-TW-staff-help.po |20928 -------
misc/translator/po/zh-Hans-TW-staff-prog.po |57926 --------------------
serials/routing-preview.pl | 1 -
t/db_dependent/Circulation/SwitchOnSiteCheckouts.t | 2 +
tools/batch_records_ajax.pl | 2 +-
tools/showdiffmarc.pl | 34 +-
19 files changed, 147 insertions(+), 134250 deletions(-)
delete mode 100644 misc/translator/po/zh-Hans-TW-marc-MARC21.po
delete mode 100644 misc/translator/po/zh-Hans-TW-marc-NORMARC.po
delete mode 100644 misc/translator/po/zh-Hans-TW-marc-UNIMARC.po
delete mode 100644 misc/translator/po/zh-Hans-TW-opac-bootstrap.po
delete mode 100644 misc/translator/po/zh-Hans-TW-pref.po
delete mode 100644 misc/translator/po/zh-Hans-TW-staff-help.po
delete mode 100644 misc/translator/po/zh-Hans-TW-staff-prog.po
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list