[koha-commits] main Koha release repository branch 20.05.x updated. v20.05.00-77-g76a4142ee9
Git repo owner
gitmaster at git.koha-community.org
Thu Jun 18 02:04:37 CEST 2020
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, 20.05.x has been updated
via 76a4142ee9cd038419002b391d4cf84bc8a8ef8c (commit)
via 8ff029dbc96208e1bd5c154bd29f9ba39164dec0 (commit)
via f3b35561dbfa89f51f6a4954085bc915c6e934a1 (commit)
via c2bcc0288d698d1b84d360a498a223d9a2425f45 (commit)
via 5151dd349e67932cb22dde7af0aea365b0c88c5b (commit)
via 7d00ec3bb717b1d1e86862ff270e3de800bd5d48 (commit)
from 9526d6efea15c95d3d0d1195f3ba72b7f7f7c7d1 (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 76a4142ee9cd038419002b391d4cf84bc8a8ef8c
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Thu Jun 4 01:07:24 2020 +0000
Bug 25070: (QA follow-up) Fix capitalization: Street Number
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 758b60f711ff97629d5f9cebabd64cec4edb1aca)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
commit 8ff029dbc96208e1bd5c154bd29f9ba39164dec0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 6 14:42:40 2020 +0200
Bug 25070: Centralize member-main-address-style
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 4a4d3ef0d8a759a485cc5f16e363bfb1f1177ab3)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
commit f3b35561dbfa89f51f6a4954085bc915c6e934a1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 6 14:25:48 2020 +0200
Bug 25070: Centralize member-display-alt-address-style
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit ac973d2d440f90ec2d9f55dd4e2c6c13a45faaec)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
commit c2bcc0288d698d1b84d360a498a223d9a2425f45
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 6 14:20:34 2020 +0200
Bug 25070: Centralize member-display-address-style
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit c32d71978c47cc810d5de8c20df89866b2ce417b)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
commit 5151dd349e67932cb22dde7af0aea365b0c88c5b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 6 14:09:06 2020 +0200
Bug 25070: Centralize member-alt-contact-style
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit cfd97049a335d50d633d4c47164d223fcc03cad2)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
commit 7d00ec3bb717b1d1e86862ff270e3de800bd5d48
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 6 13:53:17 2020 +0200
Bug 25070: Centralize member-alt-address-style
There are 5 includes files per value of AddressFormat (us, de, fr).
The code is duplicated for each language, the only thing that changes is the order.
Wwith this patchset we are going to refactore them to avoid further regressions.
The idea is to remove all code that is duplicated and remove the need of
having 5*3 files. We are going to limit them to 5 files, 1 per use.
Note that we could go even further, for instance
member-display-alt-address-style and member-display-address-style are
quite identical.
Test plan (for the whole patchset):
- Create a patron with all the address, contact and alternate info filled
- Edit them and save
- Look at the patron's info (top left) in the patron module, and the
patron detail view.
- Play with the different values of AddressFormat
The order and the info must be displayed identically before and after
this patchset. No change is expected.
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit fdca61a7455bb5bdca32a718a43a7e2688bcea46)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 7 +-
.../en/includes/member-alt-address-style-de.inc | 162 --------------
.../en/includes/member-alt-address-style-fr.inc | 162 --------------
.../en/includes/member-alt-address-style-us.inc | 160 --------------
.../prog/en/includes/member-alt-address-style.inc | 244 +++++++++++++++++++++
.../en/includes/member-alt-contact-style-de.inc | 126 -----------
.../en/includes/member-alt-contact-style-fr.inc | 126 -----------
.../en/includes/member-alt-contact-style-us.inc | 126 -----------
.../prog/en/includes/member-alt-contact-style.inc | 198 +++++++++++++++++
.../includes/member-display-address-style-de.inc | 16 --
.../includes/member-display-address-style-fr.inc | 19 --
.../includes/member-display-address-style-us.inc | 16 --
.../en/includes/member-display-address-style.inc | 74 +++++++
.../member-display-alt-address-style-de.inc | 16 --
.../member-display-alt-address-style-fr.inc | 21 --
.../member-display-alt-address-style-us.inc | 16 --
.../includes/member-display-alt-address-style.inc | 76 +++++++
.../en/includes/member-main-address-style-de.inc | 125 -----------
.../en/includes/member-main-address-style-fr.inc | 126 -----------
.../en/includes/member-main-address-style-us.inc | 125 -----------
.../prog/en/includes/member-main-address-style.inc | 190 ++++++++++++++++
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 7 +-
.../prog/en/modules/members/memberentrygen.tt | 21 +-
.../prog/en/modules/members/moremember-brief.tt | 7 +-
.../prog/en/modules/members/moremember-print.tt | 7 +-
.../prog/en/modules/members/moremember.tt | 14 +-
26 files changed, 800 insertions(+), 1387 deletions(-)
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-fr.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-fr.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-de.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-us.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-de.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-fr.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-us.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list