Trivial correction. Only touches comments.
Test plan:
Run git grep -E "borroewr|borow". You should not find anything now.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Typos in comments corrected.
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 7d4e7e4e52)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Removes the Smithsonian as a target installed with the
sample data during installation.
Also adds the newer LOC authority targets to files where
they were missing.
To test:
- Verify the Smithsonian has been removed from all
translated installers
- Verify the files are still valid SQL and install
correctly
NOTE: There was tiny scope creep which included ensuring
there were two Authority z39.50 servers as well.
Text files properly reflect the removal.
SQL 'source' of SQL files worked properly.
Was able to Z39.50 search for all of the 'en'.
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@koha-community.org>
Signed-off-by: Mason James <mtj@kohaaloha.com>
TEST PLAN
---------
1) backup db
2) git checkout -b my_3.6.x origin/3.6.x
3) drop db and create blank one
4) git reset --hard origin/3.6.x
5) run web installer
6) set HomeorHoldingBranchReturn system preference to 'holdingbranch'.
7) create a Default checkout, hold rule
home -> koha administration -> Circulation and fines rules
-- I put 10 checkouts total and clicked 'Save'
-- there currently is not 'returnbranch' in default_circ_rules.
8) git reset --hard origin/3.20.x
-- or whatever version you apply this to
(3.8.x, 3.10.x, 3.14.x, 3.16.x, 3.18.x, or 3.20.x
-- 3.21.00.008 deletes the systempreference involved)
9) ./installer/data/mysql/updatedatabase.pl
10) check HomeorHoldingBranchReturn systempreference
-- Currently says 'holdingbranch', but
the value of 'returnbranch' in default_circ_rules is
'homebranch'.
11) repeat steps 3-8
12) apply this patch
13) repeat steps 9-10
-- Currently says 'holdingbranch', and
the value of 'returnbranch' in default_circ_rules is
'holdingbranch'.
14) run koha qa test tools
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Tested using 3.6.x install, updated to 3.8.x
Value is preserved
No errors
Signed-off-by: Jonathan Druart <jonathan.druart@koha-community.org>
Note: I haven't followed the test plan, but the fix is trivial.
Maybe it could worth to upate 3.21.00.008 and check the value of
HomeOrHoldingBranchReturn before deleting it.
We could raise a warning if HomeOrHoldingBranchReturn ==
'holdingbranch'.
Signed-off-by: Mason James <mtj@kohaaloha.com>
This patch removes the NOT NULL restriction on biblioitems.marcxml and
deletedbiblioitems.marcxml due to STRICT_TRANS_TABLES default in
Mysql 5.6.22 and onwards.
Test:
1. check mysql global settings:
mysql > SELECT @@GLOBAL.sql_mode;
verify that STRICT_TRANS_TABLES is not set
2. set STRICT_TRANS_TABLES (or upgrade mysql to > 5.6.21)
mysql > SET @@GLOBAL.sql_mode = 'STRICT_TRANS_TABLES';
3. try to add biblio in Cataloguing module
verify that it fails with a "software error"
4. apply patch
5. repeat 3 and verify that there is no "software error" any more
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
I confirm with the problem with mariadb and STRICT_TRANS_TABLES enabled.
On adding a biblio (C4::Biblio::AddBiblio), biblioitems is populate in
_koha_add_biblioitem but marxcml is not generated yet. It's in
ModBiblioMarc, few lines later.
The NOT NULL condition is not valid here.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
It makes no sense to have TRUNCATE or foreign key checks.
TEST PLAN
---------
1) Back up your database
2) in an mysql client:
use kohadata;
SET FOREIGN_KEY_CHECKS=0;
TRUNCATE currency;
source /home/mtompset/kohaclone/installer/data/mysql/ru-RU/optional/sample_currency.sql
SET FOREIGN_KEY_CHECKS=0;
TRUNCATE currency;
source /home/mtompset/kohaclone/installer/data/mysql/uk-UA/optional/sample_currency.sql
SET FOREIGN_KEY_CHECKS=0;
TRUNCATE currency;
source /home/mtompset/kohaclone/installer/data/mysql/it-IT/necessari/parameters.sql
SET FOREIGN_KEY_CHECKS=1;
QUIT
-- These should all work without problem.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
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: Mason James <mtj@kohaaloha.com>
When a patron has many checked out items, circulation.pl can take a very
long time to load ( on the order of minutes in some cases ). This is
primarily due to the processing of the previous checkouts list. If we
convert to this table to a datatable that fetches its data via ajax, we
can make circulation.pl far more responsive. The same should be done
with relative's checkouts as well.
Test Plan:
1) Apply this patch
2) Observe that the checkouts and relatives' checkouts tables
are now loaded asynchronously
3) Observe and verify the renew and return actions are now
ajax based and function in a manner equivilent to how they
used to.
This bug had quite a few followups, so I squashed all of them into one
change so that code is easier to follow. Original commit messages are below:
Bug 11703 - Use the ajax datatables on patron details page
Bug 11703 - Convert holds tables to ajax datatables
Bug 11703 [QA Followup 1] - Center bProcessing message over table
Bug 11703 [QA Followup 2] - Remove icons from checkout and clear buttons
Bug 11703 [QA Followup 3] - Remove references to UseTablesortForCirc
Bug 11703 [QA Followup 4] - Add back in Today's checkouts/Previous checkouts rows
Bug 11703 [QA Followup 5]
Bug 11703 [QA Followup 6] - Move strings to an include file for translation purposes
Bug 11703 [QA Followup 7] - Fix issues spotted by koha-qa.pl
Bug 11703 [QA Followup 8] - Speed up api/checkouts.pl as much as possible
Bug 11703 [QA Followup 9] - Move scripts from api directory to svc directory
Bug 11703 [QA Followup 10] - Fix errors caused by rebase
Bug 11703 [QA Followup 11] - Prevent multiple fetchs from ajax source
Bug 11703 [QA Followup 12] - Fix problem detected by koha-qa.pl
Bug 11703 [QA Followup 13] - Removed uneccessary data from renewal box during renewal
Bug 11703 [QA Followup 14] - Fix table column span
Signed-off-by: Dobrica Pavlinusic <dpavlin@rot13.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Test plan on bug report:
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11703#c98
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>
Bug 11703 [QA Followup]
* Bold record title, fix table width
* Change output_pref_due to output_pref
* Retain functionality of IssuesDefaultSortOrder system preferences
* Use datatables.inc in circulation.tt
* Fix up holds table details
* Add plugin to about
* fix relatives' checkouts
* add too_many string
* remove dead syspref from db
* Sort relatives' checkouts and holds tables client side
* Provide context for translation of strings
* Fix unterminated string literal, add missing paren
* Add replacement of _AUTHOR_ with title's author for holds
* Format prices correctly
* Format checkout dates correctly
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>
Bug 11703 [QA Followup] - Use format instead of replace for string translation
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>
Bug 11703 [QA Followup] - Use interface instead of themelang for checkboxes plugin
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>
Bug 11703 [QA Followup] - Restore showing earliest renewal date for 'too early' renewals
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>
Bug 11703: (qa-followup) fix update database entry
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>
Bug 11703 [QA Followup] - Stop IE from caching ajax request
Signed-off-by: Britta Cramer <britta.cramer@inm-gmbh.de>
Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>
Bug 11703 [QA Followup] - Allow keyboard navigation of tabs
Signed-off-by: Britta Cramer <britta.cramer@inm-gmbh.de>
Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>
Bug 11703 [QA Followup] - Change "No data available in table" to "Loading..."
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>
Bug 11703: (qa followup) consistency in svc
This patch removes the trailing .pl from the introduced svc scripts.
Also removes a leftover (wrong license text)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This patch must be tested on top of bug 11021
This patch adds 3 fields to unimarc_complete french framework
- 359 (2-a-b-c-d-e-f-g-h-i-p-u-v) used by Sudoc network, to be displayed in tab 3
- 947 (c) used by Electre
- 969 (a-h) used by Electre
I don't know the difference between 969a and 969h so I gave them quite the same name
To test :
1) take a fresh Koha with unimarc marcflavor
2) in web installer, select french language, unimarc marflavor and "Grilles de catalogage complètes".
3) check default framework in Administration > MARC Frameworks : it should contains 359/947/969 fields
Signed-off-by: Gaetan Boisson <gaetan.boisson@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
First patch, for "complete" framework, used by academic libray
900, 901, 910, 918, 920,950,960,970,980,987 fields were useless. I removed them.
I kept only the fields mentionned in Sudoc documentation http://documentation.abes.fr/sudoc/formats/loc/index.htm
916 field is not cited in that page, but it belongs to Sudoc format.
I kept also 2 fields specific to Electre in 2013 :
902 niveau de lecture (Electre)
903 indexation (Electre)
I also added to the name of the 9XX fields I kept the mention (Sudoc) / (Electre) / (Koha), so it could be easier for librarians to know what is the purpose and the origin of each field
I don't make an updatedatabase, because some libraries could still be using these fields for good or bad reasons.
To test :
1) take a fresh Koha with unimarc marcflavor
2) in web installer, select french language, unimarc marflavor and "Grilles de catalogage complètes".
3) check default framework in Administration > MARC Frameworks : it should be without 900,901,910,918,920,950,970,980,987
Signed-off-by: Gaetan Boisson <gaetan.boisson@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
After install, the syspref opaccolorstylesheet will by default contain colors.css.
This file exist in OPAC prog theme but not in bootstrap theme.
This patch set the syspref empty by default in installer/data/mysql/sysprefs.sql.
Test plan :
- Create a fresh install
- Look at opaccolorstylesheet content
=> without this patch : is contains colors.css
=> with this patch : it is empty
- Enable opac bootstrap theme
- Go to opac main page
- Look at HTTP errors (with firebug for example)
=> without this patch : there is a 404 error because colors.css does not exist
=> with this patch : no such error
Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
To test:
- Apply this patch.
- Reset your DB (DROP DATABASE, CREATE DATABASE -- whatever method you
prefer)
- Install it-IT templates on command line
- Run the webinstaller using it-IT
- Follow the steps and choose all under 'opzionali'
=> SUCCESS: no errors
=> Sign this
=> Extra: see the authorised value 'RELTERMS' and check if you like the
translation
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Tested loading file.
Two errors fixed:
a) duplicate line ... ('RELTERMS','con', 'Conservatore')
b) missing semicolon ... ('RELTERMS','voc','Cantante')
With that file loads Ok
No koha-qa errors
Ooops, forget the fix. Resubmited
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Adds an optional SQL file to the Italian installer - works as expected.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Removed BOM from file.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Accidentally the ISSUESLIP got copied to the RESERVESLIP.
This adds the correct text and formatting to the RESERVESLIP.
To test:
- Run the German web installer on an empty database
- Check that the ISSUESLIP and RESERVESLIP notices are different
and display correctly
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Tested using webinstaller, all optionals, all ok.
ISSUESLIP(Ausleihquittung) longer than RESERVESLIP(Vormerkung)
No errors
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This updates the German default frameworks for bibliographic records
and authorities using the files created from the po files on Pootle.
To test:
- Run the web installer, make sure all mandatory data is selected
- Verify there are no SQL errors
- Check cataloguing behaves normally
- Check adding authorities behaves normally
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Tested using webinstaller.
No errors
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This updates the German simple and fast add frameworks
using the files created from the po files on Pootle.
To test:
- Run the web installer, make sure all mandatory data is selected
- Verify there are no SQL errors
- Check cataloguing behaves normally
- Check adding authorities behaves normally
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Tested using webinstaller
Checked
No errors
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Changes:
- Translates new notices SHARE_ACCEPT und SHARE_INVITE
- Copies subtag_registry.sql from en as after applying patch
from bug 12275 - so 'Laotisch' will show up correctly
- Rephrases and corrects spelling for user permissions
- Translates new authorized value SIP_MEDIA_TYPE
- Improves translations of creator sample data
- Improves translations of sample patron categories
- translations in po files were changed accordingly
To test:
- Run the web installer, install all mandatory and optional
sample data
- Check everything is installed without errors
- Verify changes listed above in the interface
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Installer works ok, values ok
No errors
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
- Corrects the German translation for 'Laotisch'
- Adds an icon to the reference item type
- Corrects capitalization for user permissions
To test:
- Run English web installer, make sure to select
the sample item types and all mandatory data
- Check user permissions appear correctly
- Check icon for REF itemtype is shown correctly
- Check that languages in Advanced Search appear
as normal
- Install German and check in language list on
advanced search 'Laotisch' now appears
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Works well following test plan.
No errors
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
To test:
- Apply this patch.
- Reset your DB (DROP DATABASE, CREATE DATABASE -- whatever method you
prefer)
- Install it-IT templates on command line
- Run the webinstaller using it-IT
- Follow the steps and choose all under 'necessari'
=> SUCCESS: no errors
=> Extra: see the italian installation and control the translation
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Tested doing it-IT install, all files selected, all load ok.
No koha-qa errors
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Ran the Italian web installer, no errors.
Checked some of the changed data, like the translated notices,
in the interface. No problems found.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
To test:
- Apply this patch.
- Reset your DB (DROP DATABASE, CREATE DATABASE -- whatever method you
prefer)
- Install it-IT templates on command line
- Run the webinstaller using it-IT
- Follow the steps and choose all under 'opzionali'
=> SUCCESS: no errors
=> Sign this
=> Extra: see the cataloguing frameworks and check if you like the
translation
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
All files load ok, no errors.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Web installer loads all files without errors.
Verified 3 bibliographic frameworks and 5 authority types
appear to be translated correctly.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
On bug 10845 some lines from sample_notices.sql were ommited when
adding the trailing parameter. This produces some errors when
installing using 'es-ES' sample data; and, in some conditions I
couldn't reproduce right now, occasional C4/NewsChannel.pm errors
due to mandatory message transport data incompletely loaded.
To reproduce:
- Make sure your setup has the es-ES translations installed and
up-to-date (translation should raise lots of warnings)
- With a cleaned (DROP DATABASE ... ; CREATE DATABASE ...;) run the
webinstaller
- Choose es-ES for the webinstaller.
- Follow the steps and choose all the sample data.
=> Errors related to sample_notices.sql and
sample_notices_message_transports.sql show.
To fix:
- Apply this patch.
- Reset your DB (DROP DATABASE, CREATE DATABASE -- whatever method you prefer)
- Run the webinstaller using es-ES
- Follow the steps and choose all sample data.
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Dunno why, but the currency symbol for NOK was given as "$", when
it should be "kr".
To test:
- Empty the "currency" table in the DB:
DELETE FROM currency;
- Load in the file changed by this patch:
sudo koha-mysql <instance> < installer/data/mysql/nb-NO/2-Valgfritt/parameters.sql
(if you are testing on a (gitified) package install)
- Check that "kr" is displayed on /cgi-bin/koha/admin/currency.pl
- Add a budget and a fund, and check that "kr" is displayed in the list
of funds (currency symbols seem to be missing from the list of budgets)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
file loads ok, kr currency active, no errors
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, no problems found.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
The line for inserting AggressiveMatchOnISBN didn't have the right
number of columns.
Test Plan:
1) Attempt to run the web installer OR try to import the sysprefs.sql
into your db
2) Apply this patch
3) Try again, no errors should be reported this time
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Test Plan:
1) Catalog a record with the ISBN "0394502884 (Random House)"
2) Export the record, edit it so the ISBN is now
"0394502884 (UnRandomHouse)"
3) Using the record import tool, import this record with matching
on ISBN.
4) You should not find a match
5) Apply this patch
6) Run updatedatabase.pl
7) Enable the new system preference AggressiveMatchOnISBN
8) Repeat step 3
9) The tool should now find a match
Signed-off-by: Tom McMurdo <thomas.mcmurdo@state.vp.us>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This patch removes a trailing space and remove the issn index deletion
(it does not exist on deletedbiblioitems).
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Mason James
Marcel de Rooy
Mark Tompsett
Benjamin Rokseth
Jonathan Druart
Galen Charlton
Kyle M Hall
Gaetan Boisson
Mathieu Saby
Fridolin Somers
Zeno Tajoli
Katrin Fischer
Koha SAB CINECA
Tomas Cohen Arazi
Magnus Enger