[koha-commits] main Koha release repository branch master updated. v19.05.00-47-g33660ea
Git repo owner
gitmaster at git.koha-community.org
Thu Jun 6 17:30:19 CEST 2019
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 33660ea283a007b668d9f230994be1869b0ac629 (commit)
via a268487d4e52fea538b9bbe6d2f0efad2fda50a1 (commit)
via b97acab4d368ccbced7d99b21fdf371f8c51f1ba (commit)
via 8c3890462750eb2b874da8afbd0e4899b11e3c42 (commit)
via f3358e97c8a1f9edf1c4de6dea46f70366237699 (commit)
via 65de22a6ef928bd6074e9a4d6a1e1351d0e1de9b (commit)
via c23276324c4da519130f35cb7c471402965b3e1b (commit)
via 6d046c2e3d301a7e1d37b376b49a0db516e67bda (commit)
via e4d1318550af78f76b7a43757bbdc4c5bddb4d5f (commit)
from c3346b50bd00778c2e8364b40a7dd7a891c713b4 (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 33660ea283a007b668d9f230994be1869b0ac629
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Jun 6 16:07:39 2019 +0100
Bug 22867: DBRev 19.06.00.003
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a268487d4e52fea538b9bbe6d2f0efad2fda50a1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon May 13 08:39:05 2019 -0500
Bug 22867: Update the syspref's description in sysprefs.sql
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b97acab4d368ccbced7d99b21fdf371f8c51f1ba
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri May 10 08:49:26 2019 +0000
Bug 22867: (QA follow-up) Build items.json for UniqueItemFields
Adding items.json, built from latest kohastructure.sql.
Control UniqueItemFields with this source file.
And add StatisticsFields.
Test plan:
Go to Preferences, play with UniqueItemFields.
Adjust StatisticsFields and look at patron record, statistics tab.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 8c3890462750eb2b874da8afbd0e4899b11e3c42
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed May 8 13:21:24 2019 +0000
Bug 22867: UniqueItemFields preference value should be pipe-delimited
This patch updates the UniqueItemFields system preference so that it
contains pipe-delimited data instead of space-delimited data. This makes
it consistent with other system preferences which contain lists of
database column names, and enables the selection process provided by Bug
22844.
This patch includes a database update to convert space-delimited values
in UniqueItemFields to pipe-delimited.
To test you should have two or more space-delimited items table columns
saved in the UniqueItemFields system preference. Apply the patch and run
the database update.
- Go to Administration -> System preferences -> Acquisitions and
confirm that the value of UniqueItemFields is now pipe-delimited.
- Set the AcqCreateItem system preference to "placing an order."
- Go to Acquisitions -> Vendor -> Basket -> Add to basket -> From a new
(empty) record.
- Fill out the item add form, including those fields specified in
UniqueItemFields.
- Click the "Add multiple items" button and specify one or more
items.
- Click "Add" and verify that in the table of items added, the fields
specified in UniqueItemFields were not duplicated.
- Edit one or more of those items and add duplicate values to one or
more of the fields specified in UniqueItemFields.
- Click "Save" and confirm that you are presented with an error
highlighting the duplicated data.
- Correct the data to remove the duplicates and click "Save" again.
It should save correctly.
- Set the AcqCreateItem system preference to "receiving an order."
- Repeat the test above during the process of receiving an order.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f3358e97c8a1f9edf1c4de6dea46f70366237699
Author: Pasi Kallinen <pasi.kallinen at koha-suomi.fi>
Date: Wed May 29 09:20:43 2019 +0300
Bug 22910: Do not copy unique patron attributes to duplicated patron
When creating a new patron by duplicating another, all of the patron
attributes are also copied into the form. Some of those value may be
unique, so don't copy those.
1) Create patron attribute types, one with "unique identifier", one without.
2) Create or a patron so it has values in both of those attributes.
3) Duplicate the patron
4) The edit form should retain the values from the "original" patron.
5) Apply patch.
6) Duplicate the patron - this time the attributes with unique values
are cleared.
Signed-off-by: Pasi Kallinen <pasi.kallinen at koha-suomi.fi>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 65de22a6ef928bd6074e9a4d6a1e1351d0e1de9b
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Thu Sep 27 19:49:27 2018 +0200
Bug 20986: (follow-up) Avoid br tags, but allow for line breaks to be added easily with CSS
This patch removes the br tags from the XSLT in favor of some more
spans and classes.
This will allow to add the line breaks with one line of CSS:
span.holdings_note_data { display:block; }
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit c23276324c4da519130f35cb7c471402965b3e1b
Author: Joy Nelson <joy at bywatersolutions.com>
Date: Fri Jun 22 15:22:40 2018 -0700
Bug 20986: Add 867 and 868 holdings display
Add line breaks in the 866 Holdings display in the OPAC details and Staff details page. Add 867 and 868 textual holdings with line breaks in the OPAC and Staff details display.
Signed-off-by: Ed Veal <eveal at mckinneytexas.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 6d046c2e3d301a7e1d37b376b49a0db516e67bda
Author: Liz Rea <wizzyrea at gmail.com>
Date: Thu May 9 02:02:55 2019 +0000
Bug 8558: (QA follow-up) a little more text clean up
You can take or leave it, honestly, I just thought
we could be a little more explicit about what we were overwriting.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e4d1318550af78f76b7a43757bbdc4c5bddb4d5f
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Mon Apr 29 03:30:30 2019 +0000
Bug 8558: Improve confirmation message for importing frameworks
This patch updates the confirmation message from:
"Do you really want to import the framework fields and subfields? This
will overwrite the current configuration. For safety reasons please use
the export option to make a backup"
to:
"Are you sure you want to import the [% frameworkcode %]
framework structure? This will overwrite the current configuration. For
safety reasons, it is recommended to use the export option to make a
backup first."
To test:
1) Go to Administration -> MARC bibliographic frameworks
2) Export one of the frameworks
3) Create a new test framework
4) Import the new test framework structure using the exported file
5) Upon clicking Confirm, confirm the message is improved and makes
sense.
Sponsored-by: Catalyst IT
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
Koha.pm | 2 +-
installer/data/mysql/sysprefs.sql | 2 +-
installer/data/mysql/updatedatabase.pl | 9 +++-
.../prog/en/modules/admin/biblio_framework.tt | 3 +-
.../en/modules/admin/preferences/acquisitions.pref | 3 +-
.../prog/en/modules/admin/preferences/items.json | 47 ++++++++++++++++++++
.../prog/en/modules/admin/preferences/patrons.pref | 5 ++-
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 41 ++++++++++++++---
koha-tmpl/intranet-tmpl/prog/js/additem.js | 4 +-
.../intranet-tmpl/prog/js/biblio_framework.js | 3 +-
.../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 40 ++++++++++++++---
members/memberentry.pl | 4 +-
12 files changed, 141 insertions(+), 22 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/items.json
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list