[koha-commits] main Koha release repository branch master updated. v3.20.00-699-g6f81f8a
Git repo owner
gitmaster at git.koha-community.org
Fri Oct 2 20:22:54 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 6f81f8a0e2309447acc6e5bb74f444102d8adf56 (commit)
via 3eb355e89203a17c04a7b533469ad7ae13e01908 (commit)
via 4f5d26aa4970f8abf7455f411ce5bb2c3694f631 (commit)
via 10c5109221f243e55a7ff4116fa56dec95c6fde4 (commit)
via 4748b17887459ef1c4c9670725e02a42bdd4824a (commit)
via 0eb3bd2f0168f9dde79bce3b800c999bf737a315 (commit)
via c4b8c17e8b64fcd8b3e81533796927457136c2c6 (commit)
via cc58bf3c81c4ad2e623d68edf94837b74b5b1d36 (commit)
via 750601ac5b97cdb2d4cf97497b87c61e5083ba33 (commit)
via c6ffbcd11ce8d933f35c0060c652c1408ad6c632 (commit)
via 640abc852c87298c4f877817ef6b051c31512db1 (commit)
via 37319996b0abf857bafa642e2f236a2782146e75 (commit)
via e0c43b5825b71163151f512ac0c7a94a5dcd6d36 (commit)
via e153d095d4736877883d80ba20e12b317073f49d (commit)
via 3cfdc833bd832b034fc976e2082d0080947e2d4b (commit)
via 4a14d1c82b05b150cecbec2a862b4f28fbb08586 (commit)
via f7fe0dd787c03362a66423aa0b5c2428dd927d0d (commit)
via 57c88aa5be8aee96c0870330c85d4d727d84c837 (commit)
via 9bdd33de213632168d7b4838fd6d83b5a9db00b8 (commit)
via d8c0b836d63e54c9a0be6714f0280d3397debdb4 (commit)
via 431d217a5185af747a8e80080cb1f381585471fc (commit)
via 49f2837b2e75511becd09059db99d209917647a7 (commit)
via a4ee9151c195a89fe70de792a36f327baa6939f2 (commit)
from b8f0a595344d28d85383007138715d7db131f136 (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 6f81f8a0e2309447acc6e5bb74f444102d8adf56
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Oct 2 15:22:10 2015 -0300
Bug 10855: DBRev 3.21.00.032
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 3eb355e89203a17c04a7b533469ad7ae13e01908
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Oct 2 15:14:22 2015 -0300
Bug 10855: (RM followup) DBIx update
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 4f5d26aa4970f8abf7455f411ce5bb2c3694f631
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Sep 3 15:38:44 2015 +0100
Bug 10855: (follow-up) Bug 10855: Remove additional field values when subscription is removed
The subscriptionid should not be escaped and placeholders used.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 10c5109221f243e55a7ff4116fa56dec95c6fde4
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Thu Sep 3 14:05:07 2015 +0200
Bug 10855: Remove additional field values when subscription is removed
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 4748b17887459ef1c4c9670725e02a42bdd4824a
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Dec 4 16:28:26 2013 +0100
Bug 10855: Update database entry
Add 2 tables: additional_fields and additional_field_values
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 0eb3bd2f0168f9dde79bce3b800c999bf737a315
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Jan 19 11:32:55 2015 +0100
Bug 10855: (follow-up) Search subscriptions by additional fields
1 occurrence of KohaAuthorisedValues had not been replaced with
AuthorisedValues on fixing a previous conflict.
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit c4b8c17e8b64fcd8b3e81533796927457136c2c6
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Jan 15 15:36:27 2015 +0100
Bug 10855: Make tests to pass
Some recent changes in master make these tests fail.
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit cc58bf3c81c4ad2e623d68edf94837b74b5b1d36
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Jan 20 10:27:48 2014 +0100
Bug 10855: Additional marc fields are not inserted
In subscription-add.pl, the code for inserting additional_fields is not
the same for updating and inserting.
This patch refactores this code in code to do the same tests.
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 750601ac5b97cdb2d4cf97497b87c61e5083ba33
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Dec 23 10:43:52 2013 +0100
Bug 10855: search with exact match if linked to an AV
If a field is linked to an AV, the search should be an exact match.
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit c6ffbcd11ce8d933f35c0060c652c1408ad6c632
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Dec 17 13:53:21 2013 +0100
Bug 10855: Fix QA issues
This patch fixes the following QA issues:
FAIL koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
FAIL forbidden patterns
forbidden pattern: KohaAuthorisedValues plugin is deprecated (see bug 10626) (line 2)
FAIL koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
FAIL forbidden patterns
forbidden pattern: KohaAuthorisedValues plugin is deprecated (see bug 10626) (line 2)
FAIL koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt
FAIL forbidden patterns
forbidden pattern: To include datatables files, please use the include file (see bug 10868) (line 12)
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 640abc852c87298c4f877817ef6b051c31512db1
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Dec 4 16:26:59 2013 +0100
Bug 10855: Squash several fixes
Bug 10855: FIX: Add additional fields for closed subscriptions
Bug 10855: Fix instance vs static method
This patch fixes the error message.
The 3 modified routines *are* static methods.
Bug 10855: FIX conflicts with bug 7688
Bug 10855: Fix typo addition_fields -> additional_fields
Bug 10855: A partial search should return the subscriptions
If a search on an additional fields is done using a partial string
("foo" and the defined value is "foobar"), the subscription should
appear in the result list.
Test plan:
Try to search a part of the string for an additional field.
Bug 10855: Filtering on additional fields don't work if value is equal to 0
If you tried to filter on an additional field linked to an authorised
value, that did not work if the value was 0.
Bug 10855: Remove the advanced serial search box on the serial home page
Bug 10855: FIX an add field should not be created if the marc field does not exist.
This patch fixes the following:
Create an add fields linked to a nonexistent marc field (does not exist
in serials).
Edit a subscription and save.
Without this patch, an error occured:
Software error:
DBD::mysql::db do failed: Column 'value' cannot be null at
/var/root-koha/bug-10855/Koha/AdditionalField.pm line 107.
Bug 10855: Fix Type table vs tablename
Koha::AdditionalField->all method take "tablename" not "table" in
parameter".
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 37319996b0abf857bafa642e2f236a2782146e75
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Aug 29 14:04:32 2013 +0200
Bug 10855: Search subscriptions by additional fields on the claim page
Test plan:
- create some serials in late.
- go on serials/claims.pl.
- choose a vendor.
- verify that additional fields are displayed in new columns.
- try filters on columns.
- verify there is no regression on this page.
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit e0c43b5825b71163151f512ac0c7a94a5dcd6d36
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Aug 29 13:58:34 2013 +0200
Bug 10855: Search subscriptions by additional fields
Now you will abble to search subscriptions by additional fields.
The additional field values will be displayed in the table results.
Test plan:
- go on the subscriptions advanced search page
(serials/serials-search.pl).
- verify all searchable additional fields are displayed on the form.
- combine 1 or more values and verify results are consistent.
- verify the values are displayed in new columns of the table.
- for field linked to an authorised value category, the description is
displayed (not the code).
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit e153d095d4736877883d80ba20e12b317073f49d
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Aug 29 13:37:40 2013 +0200
Bug 10855: New fields on adding/updating a subscription
This patch adds the ability to add values for additional fields when
adding/updating a subscription.
Test plan (test the following on adding a new subscription and on
editing an existent one):
- add/edit a subscription.
- verify all additional fields appears into the "Additional fields"
block.
- fill a value for af1 and af3.
- fill others values if you are adding a new subscription.
- save.
- verify values appears on the detail of the subscription page.
- verify the af2 field is automatically filled with the specified
marc field of the notice.
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 3cfdc833bd832b034fc976e2082d0080947e2d4b
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Aug 29 13:32:30 2013 +0200
Bug 10855: interface configuration for adding new fields to subscriptions
This patch adds an interface configuration for adding fields to
subscriptions.
Test plan:
- go to serials/serials-home.pl
- click on the "Add subscription fields" link on the left of the screen
- try to add/update/delete new fields
You are not abble to add a field with an authorised value category and a
marcfield. Columns are sortable
- for the rest, you should have, at least:
* a new field named af1, sortable, linked to a category
* a new field named af2, sortable, linked to a marcfield
* a new field named af3, not sortable
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 4a14d1c82b05b150cecbec2a862b4f28fbb08586
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Aug 29 12:43:27 2013 +0200
Bug 10855: Add unit tests for the new package Koha::AdditionalField
Test plan:
- prove t/db_dependent/AdditionalField.t
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit f7fe0dd787c03362a66423aa0b5c2428dd927d0d
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Aug 29 12:42:41 2013 +0200
Bug 10855: Add the new package Koha::AdditionalField
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 57c88aa5be8aee96c0870330c85d4d727d84c837
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 16 09:01:26 2015 +0100
Bug 14829: Fix shortcuts in the cataloging and patron modules
In these 2 modules, the shortcuts alt+q, alt+r and alt+u don't work as
in other modules.
The tab are not "built" in the correct order and the id returned to
select the correct tab is wrong.
Test plan:
Go on the circ home page (circ/circulation-home.pl), the patron home
page (members/members-home.pl) and the cataloging home page
(cataloguing/addbooks.pl).
On these 3 pages, without this patch, the shortcuts select different
tabs.
With this patch, the issue is fixed for all of them.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 9bdd33de213632168d7b4838fd6d83b5a9db00b8
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Tue Aug 11 10:19:05 2015 +0200
Bug 14671: Allow correct translation of CAS authentication
In authentication pages with CAS, the use of acronym or abbr tags does not allow a correct translation of the text.
See http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5983#c7
It does not help a lot end users to know that CAS is Central Authentication Service, I think. Now one can custom the login page with NoLoginInstructions syspref to describe how to use the authentication.
This patch removes the use of acronym and abbr is authentication pages.
Test plan (example with fr-FR locale) :
- Without patch
- Update translation files : cd misc/translator ; perl translate update fr-FR
- You see in fr-FR-opac-bootstrap.po : msgid "If you have a "
- Is is translated in : msgstr "Si vous avez un compte "
- Apply patch
- Update translation files : cd misc/translator ; perl translate update fr-FR
- You see in fr-FR-opac-bootstrap.po : msgid "If you have a CAS account, %s please "
- You can now translate it : msgstr "Si vous avez un compte CAS, %s veuillez "
- Same test for intranet authentication page
- Install the translation : cd misc/translator ; perl translate install fr-FR
- Look at the result
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Works as advertised. Tranlated OK, tested in spanish es-ES
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit d8c0b836d63e54c9a0be6714f0280d3397debdb4
Author: Lari Taskula <larit at student.uef.fi>
Date: Fri Sep 25 14:06:40 2015 +0000
Bug 14880: Keyboard shortcuts don't work after setting CircAutocompl to "Don't try"
The issue is that CircAutocompl loads a script element under #header_search
element. When this element is missing, it also messes up the indexing,
because we were calculating the indexing of the found element by subtracting
one from the found element's index (to eliminate the <script> element).
Thats why the shortcut key problem in this bug takes you one too to the left,
because we are still subtracting one from the index even though there is no
<script> element anymore.
This patches selects only the div elements and gets the index from them.
No subtractions needed.
To test keys:
1. Set CircAutocompl system preference to Don't try.
2. Try the shortcut keys. They will work incorrectly like this:
Alt+U = Search catalogue
Alt+R = Check out
Alt+Q = Check in
3. Set CircAutocompl system preference to Try.
4. Try the shortcut keys. They will work correctly like this:
Alt+U = Check out
Alt+R = Check in
ALt+Q = Search catalogue
5. Apply patch
6. Repeat step 1 and 4.
7. Repeat step 3 and 4.
8. Observe that regardless of CircAutocompl, shortcut keys worked correctly.
Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 431d217a5185af747a8e80080cb1f381585471fc
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Apr 15 11:30:17 2015 +0200
Bug 10181: Acq - Improve message for deleted records
There are some issues here:
1/ Message not translatable (set in the pl file)
2/ ' by 'displayed even if no author defined
3/ Message not the same every where
4/ Nothing displayed on the invoice page
Test plan:
1/ Create a basket
2/ Add 4 orders A, B, C, D
3/ On the basket, you see "$title by $author", or "$title" if no author
defined
4/ Delete order A, B
5/ Close the basket
6/ Receive B, C
7/ Delete record created for A, C
8/ Go on the basket page, you should see the title and "Deleted
bibliographic record, can't find title" for the deleted record
9/ Go on the invoice page, you should see the title and "Deleted
bibliographic record, can't find title" for the deleted record
Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 49f2837b2e75511becd09059db99d209917647a7
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Apr 15 10:54:48 2015 +0200
Bug 10181: Make string translatable
Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit a4ee9151c195a89fe70de792a36f327baa6939f2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Sep 14 09:50:39 2015 +0100
Bug 14812: Display the help in the correct language
If opaclanguages != language, the language of the help page is the
default one (en).
Test plan:
1/ Set language to en, fr-FR, ar-Arab and opaclanguages to en, fr-FR
2/ Translate the fr-FR and ar-Arab templates.
3/ Go on the mainpage, switch to ar-Arab, go to the help page.
The help page content should be in Arabian, not English.
Signed-off-by: Magnus Enger <magnus at libriotech.no>
Set language = en, sv-SE, nb-NO. opaclanguage = en, nb-NO
Went to the intranet main page, selected Swedish and clicked on help
Without the patch, help was displayed in English
With the patch, help was displayed in Swedish. Yay!
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
-----------------------------------------------------------------------
Summary of changes:
C4/Serials.pm | 64 ++-
Koha.pm | 2 +-
Koha/AdditionalField.pm | 439 ++++++++++++++++++++
Koha/Schema/Result/AdditionalField.pm | 134 ++++++
Koha/Schema/Result/AdditionalFieldValue.pm | 114 +++++
acqui/basket.pl | 2 -
acqui/invoice.pl | 2 -
help.pl | 4 +
installer/data/mysql/kohastructure.sql | 31 ++
installer/data/mysql/updatedatabase.pl | 29 ++
.../prog/en/includes/cataloging-search.inc | 3 +-
.../prog/en/includes/patron-search.inc | 18 +-
.../prog/en/includes/serials-menu.inc | 1 +
koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js | 2 +-
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 11 +-
.../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 10 +-
koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 2 +-
.../prog/en/modules/serials/add_fields.tt | 176 ++++++++
.../prog/en/modules/serials/claims.tt | 107 ++---
.../prog/en/modules/serials/serials-home.tt | 1 -
.../prog/en/modules/serials/serials-search.tt | 63 +++
.../prog/en/modules/serials/subscription-add.tt | 34 ++
.../prog/en/modules/serials/subscription-detail.tt | 25 +-
.../opac-tmpl/bootstrap/en/modules/opac-auth.tt | 6 +-
serials/add_fields.pl | 126 ++++++
serials/claims.pl | 10 +
serials/serials-search.pl | 21 +
serials/subscription-add.pl | 41 ++
serials/subscription-detail.pl | 8 +
t/db_dependent/AdditionalField.t | 304 ++++++++++++++
30 files changed, 1682 insertions(+), 108 deletions(-)
create mode 100644 Koha/AdditionalField.pm
create mode 100644 Koha/Schema/Result/AdditionalField.pm
create mode 100644 Koha/Schema/Result/AdditionalFieldValue.pm
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt
create mode 100755 serials/add_fields.pl
create mode 100644 t/db_dependent/AdditionalField.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list