[koha-commits] main Koha release repository branch master updated. v17.11.00-221-g6dd0ff2
Git repo owner
gitmaster at git.koha-community.org
Fri Dec 22 17:22:41 CET 2017
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 6dd0ff217460375bb01e192f642c592912c6fcbb (commit)
via 1a132440766277d6d94246a86ec671b79de7a442 (commit)
via 8425ab43dde41f30d73cbcd4a781f260fcffea44 (commit)
via a523f09e043fa7d6a17fc93406f966cab5671583 (commit)
via 06a1f18a1b7c0b34d0519084d17fd52a7f32bec4 (commit)
via 9a2767b577abd38bf63a2f815339eed3b93ecba7 (commit)
via ec2ca4eecf7c720356b0de8f46ad0affbe5004f5 (commit)
via 786086cfcfd57509b9ff9f5ab8d3ff24ad3d1ecc (commit)
via 4fc594bcb4b9e3fb1fd56f0bdb350bde5c84c73e (commit)
via 84a8f09ec2b4288092f6035555fa91b400a015ef (commit)
via 122f5441323cb257fd0aaa171e2f00c7dfbcf189 (commit)
via f98b47cf3ae666318c815f319289586bfc5717a4 (commit)
via e111e4415d41d557984630b5a9bfbdfd9ba0df19 (commit)
via c4da034dd3074e589c2c963fd5df7600b3b8f996 (commit)
via 46f4f7d6c2857644e3c2d2b0c152007037fb0409 (commit)
via 103fe109b22b48d506848a0a1bc43556c9dfda4b (commit)
via 69c8e07ca0697bd3d5beefbd7dfd84f6bb0ead88 (commit)
via 62a8f49848b4b8b450e3c643ed6014a0cfbe420c (commit)
via 96a42b873aa0cd183fae31bb25292b975ebdd589 (commit)
via 70bb6fe0ae5eae74e86c765480fd188ec2da0f61 (commit)
via c728506815ab22df06dd81c346762ee6bb0a2fa3 (commit)
via edcf4af0953f89573b760529303c388e2ae818b4 (commit)
via 7e21ffe6c5e09ad1f5a1023e32be88f5a43a9d68 (commit)
via 809175f3d4b0293e934e56654994797f38330e08 (commit)
via 252c7c06b30a0f42aa523752e6e3aef02f16af41 (commit)
from 9e465e3608cbc4422b695aaef2da26592706d82f (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 6dd0ff217460375bb01e192f642c592912c6fcbb
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Thu Dec 21 18:12:38 2017 +0000
Bug 19753: (QA follow-up) Style invoices menu item when on individual invoice page
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 1a132440766277d6d94246a86ec671b79de7a442
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Dec 5 14:20:11 2017 +0000
Bug 19753: Move template JavaScript to the footer: Acquisitions
This patch modifies some staff client acquisitions templates so that
JavaScript is included in the footer instead of the header.
This patch adds a JavaScript file, acquisitions-menu.js, which controls
the highlighting of the current page in the sidebar. Highlighting will
be temporarily broken for pages which have not been modified to include
this file
To test, apply the patch and test the JavaScript-driven features of the
modified templates: All button controls, DataTables functionality, tabs,
etc.
- Acquisitions home page
- Datatable, Inactive budget controls
- Vendor search results
- Acquisitions -> Vendor search
- Datatables, "Show all" links
- Basket
- Acquisitions -> Vendor -> Basket
- Datatables, button controls, add managing user
- Add to basket from a staged file
- Acquisitions -> Vendor -> Basket -> Add to basket from a staged file
- Datatables, tabs, selection controls
- Edit basket
- Acquisitions -> Vendor -> Edit basket
- Form validation
- EDIFACT messages
- Acquisitions -> EDIFACT messages
- Datatables, message preview
- Orders search
- Acquisitions -> Order search
- Full orders search form
- Patron autocomplete in "Basket created by" field
- Datepickers
- Orders search results
- Datatables, column visibility
- Invoices
- Acquisitions -> Vendor -> Invoices -> Invoice
- Form validation, datepickers, datatables
- Invoice files (enable AcqEnableFiles preference)
- Manage invoice files
- File list datatable
Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8425ab43dde41f30d73cbcd4a781f260fcffea44
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Dec 1 15:44:59 2017 +0000
Bug 19744: Move template JavaScript to the footer: Offline circulation
This patch modifies the staff client offline circulation templates so
that JavaScript is included in the footer instead of the header.
To test, apply the patch and test the JavaScript-driven features of the
modified templates: All button controls, DataTables functionality, tabs,
etc.
Circulation -> Built-in offline circulation interface
-> Synchronize
-> Download records
-> Check out
-> Check in
-> Synchronize
-> Upload transactions
-> Pending offline circulations
-> Check all, uncheck all
-> Delete
-> Process
Circulation -> Upload offline circulation data
-> Upload .koc file (gerated by the Koha Offline Circulation program,
for instance).
Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a523f09e043fa7d6a17fc93406f966cab5671583
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Apr 25 12:25:32 2017 -0300
Bug 17951: (follow-up) Make Makefile.PL handle template_cache_dir config
This patch adds Makefile.PL the capability of handling the template_cache_dir configuration entry.
To do so, it:
- Adds the --template-cache-dir option switch (consistency with koha-create)
- Sets a default value for template_cache_dir to '/tmp/koha'
- Adds a dialog requesting the path for the template cache dir to Makefile.PL
- It tweaks etc/koha-conf.xml so it is correctly changed by rewrite-config.PL
To test:
- Apply this patch
- Run:
$ perl Makefile.PL --template-cache-dir your/favourite/dir
=> SUCCESS: The dialogs don't ask for template cache dir
=> SUCCESS: The resulting Makefile contains an entry for TEMPLATE_CACHE_DIR which value
matches what we passed to --template-cache-dir
- Run:
$ perl Makefile.PL
- When prompted for a template cache dir, introduce whatever you want
=> SUCCESS: The default you are offered is /tmp/koha
=> SUCCESS: At the end of the process, Makefile contains what we put in there
- Run:
$ sudo make install
=> SUCCESS: The resulting koha-conf.xml contains a <template_cache_dir> entry containing
whatever you picked for that purpose.
- Sign off :-D
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 06a1f18a1b7c0b34d0519084d17fd52a7f32bec4
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Jan 24 12:48:18 2017 -0300
Bug 17951: Make koha-create set template_cache_dir correctly
This patch makes koha-create (and friends) handle the template_cache_dir
config entry correctly.
It does so by:
- Adding a replaceable string to the template for koha-conf.xml
- Making koha-create-dirs create the needed directories (i.e.
/var/cache/koha/instance and /var/cache/koha/instance/templates)
- Adding a --template-cache-dir switch to koha-create (so sysadmins can
specify their favourite directory for the templates cache).
- koha-remove now takes care of the instance's *templates* dir.
- The install scripts now automatically create /var/cache/koha so it can
be used later by koha-create and friends. It does so the same way it does
for other install-created directories.
To test, you should ideally be able to build your own packages. This
instructions can be followed by people that doesn't have that ability
yet. But can be used on a custom packages setup too.
To test:
- Make sure you have the latest misc4dev in your kohadevbox (if it is a
fresh box you have it already)
- Run:
$ sudo perl misc4dev/cp_debian_files.pl
- Manually create the /var/cache/koha dir (skip if you have your own
packages):
$ sudo mkdir /var/cache/koha
- Create a new instance:
$ sudo koha-create --create-db cachetest
=> SUCCESS:
* /etc/koha/sites/cachetest/koha-conf.xml contains
template_cache_dir and is populated with /var/cache/koha/cachetest/templates
* The directory /var/cache/koha/cachetest/templates exists!
- Create a new instance, pass your own cache dir:
$ sudo koha-create --create-db --template-cache-dir /tmp cachetest2
=> SUCCESS: etc/koha/sites/cachetest2/koha-conf.xml contains template_cache_dir
and is populated with /tmp
- Run:
$ man koha-create
=> SUCCESS: The docs mention the --template-cache-dir option switch
correctly.
- Sign off :-D!
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9a2767b577abd38bf63a2f815339eed3b93ecba7
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri May 20 12:19:49 2016 -0400
Bug 16764: Update printers administration page
This patch updates the template for printers administration according to
current interface guidelines.
- Custom JavaScript form validation is removed in favor of the built-in
form validation plugin.
- Printer-specific header search form is removed, along with server-side
pagination code. The functionality of both is now taken care of the
adding DataTables sorting and pagination to the table.
- Edit and delete links are styled as Boostrap buttons with Font Awesome
icons.
- Confirmation dialogs are updated to use Font Awesome icons.
To test properly you will need to add multiple printers.
- Apply the patch and open /cgi-bin/koha/admin/printers.pl (there is no
menu link for the page).
- When no printers exist you should see a message dialog saying so.
- Add a new printer. Confirm that printer name and queue are required
fields.
- After adding multiple printers, confirm that the table of printers is
correctly sorted and searched by the DataTables plugin.
- Delete a printer and verify that the confirmation dialog is correctly
styled.
Signed-off-by: Marc Véron <veron at veron.ch>
Update: rebased and updated Bootstrap 3 classes
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ec2ca4eecf7c720356b0de8f46ad0affbe5004f5
Author: Lari Taskula <lari.taskula at jns.fi>
Date: Thu Dec 21 13:56:34 2017 +0200
Bug 19857: Use BorrowerUnwantedField system preference for SMS provider selection
Optionally hide SMS provider field in patron modification screen with
BorrowerUnwantedField system preference.
To test:
1. Apply patch
2. Append BorrowerUnwantedField with sms_provider_id and save changes
3. Go to patron modification screen in staff client
4. Observe the SMS provider selection is now hidden
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 786086cfcfd57509b9ff9f5ab8d3ff24ad3d1ecc
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Dec 22 07:43:39 2017 +0000
Bug 19828: (QA follow-up) Fix rethrowing exception and move rethrowing out of 'if' statement just in case the exception does not came from DBIx::Class
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4fc594bcb4b9e3fb1fd56f0bdb350bde5c84c73e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Dec 20 15:33:48 2017 -0300
Bug 19828: Fix tests that expect DBD errors instead of the exception message
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 84a8f09ec2b4288092f6035555fa91b400a015ef
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Dec 18 13:48:56 2017 -0300
Bug 19828: Make Koha::Object->store translate DBIC exceptions into Koha exceptions
This patch introduces a try/catch block in store() and parses the error
when an exceptional situation takes place.
It only deals with FK constraint violations and duplicate IDs. The rest of the DBIC exceptions
are rethrown.
To test:
- Apply this patch
- Run:
$ kshell
k$ prove t/db_dependent/Koha/Object.t
=> SUCCESS: Tests pass!
- Sign off :-D
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 122f5441323cb257fd0aaa171e2f00c7dfbcf189
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Dec 18 13:47:53 2017 -0300
Bug 19828: Unit tests
This patch introduces unit tests for the changes this bug introduces to
Koha::Object->store.
To test:
- Apply this patch
- Run:
$ kshell
k$ prove t/db_dependent/Koha/Object.t
=> FAIL: Tests should fail because the changes are not implemented on this patch
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f98b47cf3ae666318c815f319289586bfc5717a4
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Dec 22 08:23:23 2017 +0100
Bug 19494: (QA follow-up) Rename column and apply title-string
As requested by Katrin, the column should not refer to Reserve but Hold.
Sorting should be the same as Waiting since-column.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e111e4415d41d557984630b5a9bfbdfd9ba0df19
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Aug 4 10:05:20 2016 +0200
Bug 19494: Add reservedate to Holds awaiting pickup
Add reservedate to report.
Change label "Available since" to "Waiting since".
Note: The table (already) crosses the boundaries of its container. Also
the vertical spacing for the first column (already) is not the same as the
others. (Adding the second date only makes it more visible.) These minor
design issues should be solved on another report.
Test plan:
[1] Go to Circulation, Holds awaiting pickup
[2] Note the additional column for reservedate.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Simon Pouchol <simon.pouchol at biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c4da034dd3074e589c2c963fd5df7600b3b8f996
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Dec 19 11:56:07 2017 -0300
Bug 19788: Add a test
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 46f4f7d6c2857644e3c2d2b0c152007037fb0409
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Mon Dec 11 08:41:05 2017 +0100
Bug 19788: Preserve case sensitivity when creating Local preferences
Fix a bug tranforming new local preference variable name in lowercase.
TO TEST:
1. Admin > System preferences > Local use
2. Button New preference. Fill variable field with 'TESTfoo'. Click
Save.
3. The new variable is named: 'testfoo'.
4. Apply the patch.
5. Button New preference. Fill variable field with 'TESTfoo2'. Click
Save.
6. The new variable is properly named: 'TESTfoo2'.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 103fe109b22b48d506848a0a1bc43556c9dfda4b
Author: David Bourgault <david.bourgault at inlibro.com>
Date: Mon Nov 27 16:05:48 2017 -0500
Bug 19702: Correct cookie path in Basket.js
This corrects the cookie path in bootstrap/js/basket.js. It used to take
the default value (current page path), but will now be "/"
Test plan:
0) Visit the OPAC, add a book to your basket
1) Navigate to the OPAC's homepage (www.domain.com, without the
/cgi-bin/koha)
-> The basket will display as empty
2) Apply patch
3) Clear your cookies and your cache
4) Redo step 1)
-> Basket will display correctly
Patch applies without issue and functions as descibed.
Signed-off-by: Dilan Johnpullé <dilan at calyx.net.au>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 69c8e07ca0697bd3d5beefbd7dfd84f6bb0ead88
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Dec 19 15:45:53 2017 -0300
Bug 19840: And avoid XSS...
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 62a8f49848b4b8b450e3c643ed6014a0cfbe420c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Dec 19 15:40:45 2017 -0300
Bug 19840: Fix - display patron note on checkin
If a patron let a note on the checkout (AllowCheckoutNotes), it is
supposed to be displayed when checked in.
Test plan:
1/ Enable AllowCheckoutNotes
2/ Check an item out
3/ At the opac let a note on the checkout
4/ Check the item in
=> With this patch applied you should see the notes displayed
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 96a42b873aa0cd183fae31bb25292b975ebdd589
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Nov 13 17:18:44 2017 +0000
Bug 19621: Use Koha.Preference on template side to display/hide "Routing lists" tab
Patch applies without issue and functions as described.
Signed-off-by: Dilan Johnpullé <dilan at calyx.net.au>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 70bb6fe0ae5eae74e86c765480fd188ec2da0f61
Author: Janusz Kaczmarek <januszop at gmail.com>
Date: Sat Nov 25 02:28:02 2017 +0100
Bug 18458: Fix subfields ordering when Merging authority records
While doing a merge, if a subfield(s) precedes the controlled subfields
(like $i before $a in 7XX, which comes before $a -- rare but will
become more and more usual) after merging will be moved to the end.
This is not right.
The patch (with AuthorityMergeMode == loose) make merge consider the
subfields order: all subfields which originally were found before
the first controlled subfield (e.g. $i before $a in 7XX / MARC 21)
will remain in the front, the rest of not controlled subfields that
should remain in the field will come after the subfields copied
from authority rec.
As a bonus, $9 will be placed at the end.
To test:
0) Have AuthorityMergeMode == loose;
1) Have some field in bibliorecord, controlled by an authority, with
extra subfield(s) (i.e. not present in authority rec.) placed at the
beginning of the field;
2) Open (not necessarily edit) and save the connected authority;
3) See that the extra subfieds were moved to the end of the field
(and $9 is in the front);
4) Apply the patch;
5) Reorder subfields in biblio field;
6) Open (not necessarily edit) and save the connected authority;
7) See that the order has been conserved, additionally $9 the last
subfield in the field.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Amended:
Moved field creation to its original place. Changed $9 handling. Simplified the following add_subfields for loop. Edited comments.
Restored the append_fields_ordered call (see comment6).
With this patch, the Merge.t test now passes.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c728506815ab22df06dd81c346762ee6bb0a2fa3
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Dec 8 13:45:55 2017 +0100
Bug 18458: Add a subtest in Merge.t
This test illustrates the problem we have if you run it without the
second patch. And it serves to demonstrate that we resolved the
situation if you run it after the second patch.
Test plan:
[1] Without the second patch: The last subtest should fail.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit edcf4af0953f89573b760529303c388e2ae818b4
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Dec 14 10:31:17 2017 -0500
Bug 19813: Make MarcItemFieldsToOrder handle non-existing tags
MarcItemFieldsToOrder defines how Koha looks at tags in order records to generate item data.
Let's look at a simplified case:
homebranch: 955$a
holdingbranch: 956$a
So, here we are looking at 955 for the home branch, and 956 for the holding branch. So, it should make sense that Koha requires that these fields exist in equal number in the record. That is, for each 955, there should be a corresponding 956.
Let's look at a different case:
homebranch: 946$a|975$a
holdingbranch: 946$a|975$a
In this case, we are using the fallback behavior. VendorA stores the branch data in 946, and VendorB stores it in 975. This seems like it would work, but it won't! That's because Koha is expecting there to be the same number of 946's as there are 975's! In reality, the VendorA records will have a number of 946's, and *zero* 975's. The inverse will be true for VendorB.
Koha should be able to skip those tags that simply don't exist in the record.
Test Plan:
1) Set MarcItemFieldsToOrder to something like:
homebranch: 946$a|975$a
holdingbranch: 946$a|975$a
budget_code: 946$f|975$f
itype: 946$y|975$y
notforloan: 946$l|975$l
ccode: 946$t|975$c
quantity: 946$q|975$q
price: 946$p|975$p
itemcallnumber: 946$n|975$n
loc: 946$c|975$t
2) Create a record using only the 975 tag for item building data
3) Import the record into Koha
4) Create a basket
5) Attempt to add the record to the basket
6) Note the unequal fields error
7) Apply this patch
8) Reload the page
9) No error!
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Marci Chen <mchen at mckinneytexas.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Amended: Fix typo occurrance and theses.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7e21ffe6c5e09ad1f5a1023e32be88f5a43a9d68
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Dec 22 11:20:13 2017 +0100
Bug 19200: (QA follow-up) Simplify call to GetBasketAsCSV
If no profile_id is passed, GetBasketAsCSV will fallback to default itself.
No need to make the distinction in basket.pl.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 809175f3d4b0293e934e56654994797f38330e08
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Tue Aug 29 21:07:39 2017 +0000
Bug 19200: Preventing warns when exporting a basket
To test:
1) Go to Tools -> CSV profiles -> New CSV Profile
2) Create a new CSV profile with any name of SQL fields. Ensure profile
type: SQL and usage: basket export in acquisition
3) Go to Acquisitions -> Find or create a vendor -> Use or create a
basket
4) Click the dropdown menu next to the 'Export as CSV' button. There
should be a 'Default' option and your new CSV profile (at least)
5) Click the 'Default' option. Notice warns
6) Click the 'Export as CSV' button. Notice warns
7) Click your new CSV profile option. Notice warns
8) Apply patch and refresh page
9) Repeat steps 5-7, confirm that warns do not show
10) Confirm export still works as expected
Sponsored-by: Catalyst IT
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jon Knight <J.P.Knight at lboro.ac.uk>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 252c7c06b30a0f42aa523752e6e3aef02f16af41
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Dec 6 13:58:04 2017 -0300
Bug 19760: Die if koha-conf is not accessible
We got a lot of support questions because scripts are executed without
the correct environment/user.
We could die and provide more useful information
Tested on my kohadevbox VM by:
1) sudo chmod a-rx /etc/koha/sites/kohadev/koha-conf.xml
2) run help.pl from the command line to produce the desired die message
3) sudo chmod a+rx /etc/koha/sites/kohadev/koha-conf.xml
4) rerun help.pl successfully
Signed-off-by: Jon Knight <J.P.Knight at lboro.ac.uk>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Bug 19760: Change wording
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/AuthoritiesMarc.pm | 31 +-
C4/Context.pm | 3 +-
Koha/Config.pm | 2 +-
Koha/Exceptions/Object.pm | 10 +
Koha/Object.pm | 28 +-
Makefile.PL | 11 +-
acqui/addorderiso2709.pl | 25 +-
acqui/basket.pl | 8 +-
admin/printers.pl | 16 +-
circ/returns.pl | 7 +-
circ/waitingreserves.pl | 1 +
debian/docs/koha-create.xml | 9 +
debian/koha-common.dirs | 1 +
debian/scripts/koha-create | 18 +-
debian/scripts/koha-create-dirs | 2 +
debian/scripts/koha-remove | 2 +
debian/templates/koha-conf-site.xml.in | 5 +-
etc/koha-conf.xml | 5 +-
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +-
.../prog/en/includes/printers-admin-search.inc | 30 -
.../prog/en/modules/acqui/acqui-home.tt | 160 +--
.../prog/en/modules/acqui/addorderiso2709.tt | 332 +++---
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 324 +++---
.../prog/en/modules/acqui/basketheader.tt | 8 +-
.../prog/en/modules/acqui/booksellers.tt | 88 +-
.../prog/en/modules/acqui/edifactmsgs.tt | 73 +-
.../prog/en/modules/acqui/histsearch.tt | 63 +-
.../prog/en/modules/acqui/invoice-files.tt | 46 +-
.../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 103 +-
.../prog/en/modules/admin/printers.tt | 162 ++-
.../intranet-tmpl/prog/en/modules/circ/offline.tt | 1141 ++++++++++----------
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +-
.../prog/en/modules/circ/waitingreserves.tt | 10 +-
.../prog/en/modules/members/memberentrygen.tt | 2 +
.../prog/en/modules/offline_circ/list.tt | 107 +-
.../prog/en/modules/offline_circ/process_koc.tt | 136 +--
.../intranet-tmpl/prog/js/acquisitions-menu.js | 8 +-
koha-tmpl/opac-tmpl/bootstrap/js/basket.js | 4 +-
members/boraccount.pl | 1 -
members/deletemem.pl | 1 -
members/files.pl | 1 -
members/mancredit.pl | 1 -
members/maninvoice.pl | 1 -
members/member-flags.pl | 1 -
members/member-password.pl | 1 -
members/moremember.pl | 1 -
members/notices.pl | 1 -
members/pay.pl | 1 -
members/paycollect.pl | 1 -
members/purchase-suggestions.pl | 1 -
members/readingrec.pl | 1 -
members/routing-lists.pl | 1 -
members/statistics.pl | 1 -
rewrite-config.PL | 1 +
t/db_dependent/Authority/Merge.t | 27 +-
t/db_dependent/Circulation/Returns.t | 2 +-
t/db_dependent/Context.t | 4 +-
t/db_dependent/Koha/Object.t | 93 +-
tools/viewlog.pl | 1 -
59 files changed, 1645 insertions(+), 1483 deletions(-)
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list