Attachment 50574 Details for Bug 12267 – Bug 12267: [QA Follow-up] Adjust installer files; tiny text edit

[patch] Bug 12267: [QA Follow-up] Adjust installer files; tiny text edit

Bug-12267-QA-Follow-up-Adjust-installer-files-tiny.patch (text/plain), 10.19 KB, created by Marcel de Rooy on 2016-04-22 09:48:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2016-04-22 09:48:08 UTC

Size: 10.19 KB

patch

obsolete

>From b396d1aa494eac662a494769c124161e82db7105 Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Fri, 22 Apr 2016 11:27:58 +0200
>Subject: [PATCH] Bug 12267: [QA Follow-up] Adjust installer files; tiny text
> edit
>Content-Type: text/plain; charset=utf-8
>
>Some installer files still refer to password_allowed.
>The print statement of the db revision has been slightly adjusted.
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> installer/data/mysql/atomicupdate/bug_12267.perl   |    2 +-
> .../data/mysql/de-DE/optional/patron_atributes.sql |    4 +--
> .../data/mysql/en/optional/patron_atributes.sql    |    4 +--
> .../data/mysql/es-ES/optional/patron_atributes.sql |    4 +--
> .../data/mysql/ru-RU/optional/patron_atributes.sql |   27 +++++++++-----------
> .../data/mysql/uk-UA/optional/patron_atributes.sql |   27 +++++++++-----------
> 6 files changed, 31 insertions(+), 37 deletions(-)
>
>diff --git a/installer/data/mysql/atomicupdate/bug_12267.perl b/installer/data/mysql/atomicupdate/bug_12267.perl
>index de48b51..2ba00f9 100644
>--- a/installer/data/mysql/atomicupdate/bug_12267.perl
>+++ b/installer/data/mysql/atomicupdate/bug_12267.perl
>@@ -6,7 +6,7 @@ my ( $column_has_been_used ) = $dbh->selectrow_array(q|
> |);
> 
> if ( $column_has_been_used ) {
>-    warn q|WARNING: The columns borrower_attribute_types.password_allowed and borrower_attributes.column have been removed from the Koha codebase. There were not used. However your installation has at least 1 borrower_attributes.password defined. In order not to alter your data, the columns have been kept, please remove them manually if you do not use them this feature.|;
>+    print q|WARNING: The columns borrower_attribute_types.password_allowed and borrower_attributes.password have been removed from the Koha codebase. They were not used. However your installation has at least one borrower_attributes.password defined. In order not to alter your data, the columns have been kept, please save the information elsewhere and remove these columns manually.|;
> } else {
>     $dbh->do(q|
>         ALTER TABLE borrower_attribute_types DROP column password_allowed
>diff --git a/installer/data/mysql/de-DE/optional/patron_atributes.sql b/installer/data/mysql/de-DE/optional/patron_atributes.sql
>index 35d61cb..861d830 100644
>--- a/installer/data/mysql/de-DE/optional/patron_atributes.sql
>+++ b/installer/data/mysql/de-DE/optional/patron_atributes.sql
>@@ -1,2 +1,2 @@
>-INSERT INTO `borrower_attribute_types` (`code`, `description`, `repeatable`, `unique_id`, `opac_display`, `password_allowed`, `staff_searchable`, `authorised_value_category`)
>-VALUES ('SHOW_BCODE',  'Zeige den Barcode in der ExemplarÃ¼bersicht', 0, 0, 1, 0, 0, 'YES_NO');
>+INSERT INTO `borrower_attribute_types` (`code`, `description`, `repeatable`, `unique_id`, `opac_display`, `staff_searchable`, `authorised_value_category`)
>+VALUES ('SHOW_BCODE',  'Zeige den Barcode in der ExemplarÃ¼bersicht', 0, 0, 1, 0, 'YES_NO');
>diff --git a/installer/data/mysql/en/optional/patron_atributes.sql b/installer/data/mysql/en/optional/patron_atributes.sql
>index 17d7b8a..ba929bc 100644
>--- a/installer/data/mysql/en/optional/patron_atributes.sql
>+++ b/installer/data/mysql/en/optional/patron_atributes.sql
>@@ -1,2 +1,2 @@
>-INSERT INTO `borrower_attribute_types` (`code`, `description`, `repeatable`, `unique_id`, `opac_display`, `password_allowed`, `staff_searchable`, `authorised_value_category`)
>-VALUES ('SHOW_BCODE',  'Show barcode on the summary screen items listings', 0, 0, 1, 0, 0, 'YES_NO');
>+INSERT INTO `borrower_attribute_types` (`code`, `description`, `repeatable`, `unique_id`, `opac_display`, `staff_searchable`, `authorised_value_category`)
>+VALUES ('SHOW_BCODE',  'Show barcode on the summary screen items listings', 0, 0, 1, 0, 'YES_NO');
>diff --git a/installer/data/mysql/es-ES/optional/patron_atributes.sql b/installer/data/mysql/es-ES/optional/patron_atributes.sql
>index 17d7b8a..ba929bc 100644
>--- a/installer/data/mysql/es-ES/optional/patron_atributes.sql
>+++ b/installer/data/mysql/es-ES/optional/patron_atributes.sql
>@@ -1,2 +1,2 @@
>-INSERT INTO `borrower_attribute_types` (`code`, `description`, `repeatable`, `unique_id`, `opac_display`, `password_allowed`, `staff_searchable`, `authorised_value_category`)
>-VALUES ('SHOW_BCODE',  'Show barcode on the summary screen items listings', 0, 0, 1, 0, 0, 'YES_NO');
>+INSERT INTO `borrower_attribute_types` (`code`, `description`, `repeatable`, `unique_id`, `opac_display`, `staff_searchable`, `authorised_value_category`)
>+VALUES ('SHOW_BCODE',  'Show barcode on the summary screen items listings', 0, 0, 1, 0, 'YES_NO');
>diff --git a/installer/data/mysql/ru-RU/optional/patron_atributes.sql b/installer/data/mysql/ru-RU/optional/patron_atributes.sql
>index 7b3d8a8..55a7cca 100644
>--- a/installer/data/mysql/ru-RU/optional/patron_atributes.sql
>+++ b/installer/data/mysql/ru-RU/optional/patron_atributes.sql
>@@ -1,17 +1,14 @@
> TRUNCATE borrower_attribute_types;
> 
>-INSERT INTO `borrower_attribute_types` (`code`, `description`, `repeatable`, `unique_id`, `opac_display`, `password_allowed`, `staff_searchable`, `authorised_value_category`) VALUES
>-('EDUCATION',  'ÐÐ±ÑÐ°Ð·Ð¾Ð²Ð°Ð½Ð¸Ðµ',                            1, 0, 1, 0, 1, ''),
>-('EDU_INST',   'Ð£ÑÐµÐ±Ð½Ð¾Ðµ Ð·Ð°Ð²ÐµÐ´ÐµÐ½Ð¸Ðµ',                      1, 0, 1, 0, 1, ''),
>-('ETHNICITY',  'ÐÑÐ½Ð¸ÑÐµÑÐºÐ°Ñ Ð¿ÑÐ¸Ð½Ð°Ð´Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ',              0, 0, 1, 0, 1, ''),
>-('ETHNICNOTE', 'ÐÐ°Ð¼ÐµÑÐ°Ð½Ð¸Ñ Ð¿Ð¾ ÑÑÐ½Ð¸ÑÐµÑÐºÐ¾Ð¹ Ð¿ÑÐ¸Ð½Ð°Ð´Ð»ÐµÐ¶Ð½Ð¾ÑÑÐ¸', 0, 0, 1, 0, 1, ''),
>-('IDLDAP',     'ÐÐ´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¾Ñ LDAP',                     0, 0, 0, 0, 1, ''),
>-('NATIONAL',   'ÐÐ°ÑÐ¸Ð¾Ð½Ð°Ð»ÑÐ½Ð¾ÑÑÑ',                         0, 0, 1, 0, 0, ''),
>-('PASSP_NO',   'Ð¡ÐµÑÐ¸Ñ Ð¸ Ð½Ð¾Ð¼ÐµÑ Ð¿Ð°ÑÐ¿Ð¾ÑÑÐ°',                 0, 0, 0, 0, 0, ''),
>-('PAS_IS_DAT', 'ÐÐ¾Ð³Ð´Ð° Ð²ÑÐ´Ð°Ð½ Ð¿Ð°ÑÐ¿Ð¾ÑÑ',                    0, 0, 0, 0, 0, ''),
>-('PAS_IS_ORG', 'ÐÐ´Ðµ Ð²ÑÐ´Ð°Ð½ Ð¿Ð°ÑÐ¿Ð¾ÑÑ',                      0, 0, 0, 0, 0, ''),
>-('PATRONYMIC', 'ÐÑÑÐµÑÑÐ²Ð¾',                               0, 0, 1, 0, 1, ''),
>-('PROFESSION', 'ÐÑÐ¾ÑÐµÑÑÐ¸Ñ',                              1, 0, 1, 0, 1, '');
>-
>--- ('PASSP_NO',   'ÐÐ¾Ð¼ÐµÑ Ð¿Ð°ÑÐ¿Ð¾ÑÑÐ°',                         0, 0, 0, 0, 0, ''),
>--- ('PASSP_PREF', 'Ð¡ÐµÑÐ¸Ñ Ð¿Ð°ÑÐ¿Ð¾ÑÑÐ°',                         0, 0, 0, 0, 0, ''),  
>+INSERT INTO `borrower_attribute_types` (`code`, `description`, `repeatable`, `unique_id`, `opac_display`, `staff_searchable`, `authorised_value_category`) VALUES
>+('EDUCATION',  'ÐÐ±ÑÐ°Ð·Ð¾Ð²Ð°Ð½Ð¸Ðµ',                            1, 0, 1, 1, ''),
>+('EDU_INST',   'Ð£ÑÐµÐ±Ð½Ð¾Ðµ Ð·Ð°Ð²ÐµÐ´ÐµÐ½Ð¸Ðµ',                      1, 0, 1, 1, ''),
>+('ETHNICITY',  'ÐÑÐ½Ð¸ÑÐµÑÐºÐ°Ñ Ð¿ÑÐ¸Ð½Ð°Ð´Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ',              0, 0, 1, 1, ''),
>+('ETHNICNOTE', 'ÐÐ°Ð¼ÐµÑÐ°Ð½Ð¸Ñ Ð¿Ð¾ ÑÑÐ½Ð¸ÑÐµÑÐºÐ¾Ð¹ Ð¿ÑÐ¸Ð½Ð°Ð´Ð»ÐµÐ¶Ð½Ð¾ÑÑÐ¸', 0, 0, 1, 1, ''),
>+('IDLDAP',     'ÐÐ´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¾Ñ LDAP',                     0, 0, 0, 1, ''),
>+('NATIONAL',   'ÐÐ°ÑÐ¸Ð¾Ð½Ð°Ð»ÑÐ½Ð¾ÑÑÑ',                         0, 0, 1, 0, ''),
>+('PASSP_NO',   'Ð¡ÐµÑÐ¸Ñ Ð¸ Ð½Ð¾Ð¼ÐµÑ Ð¿Ð°ÑÐ¿Ð¾ÑÑÐ°',                 0, 0, 0, 0, ''),
>+('PAS_IS_DAT', 'ÐÐ¾Ð³Ð´Ð° Ð²ÑÐ´Ð°Ð½ Ð¿Ð°ÑÐ¿Ð¾ÑÑ',                    0, 0, 0, 0, ''),
>+('PAS_IS_ORG', 'ÐÐ´Ðµ Ð²ÑÐ´Ð°Ð½ Ð¿Ð°ÑÐ¿Ð¾ÑÑ',                      0, 0, 0, 0, ''),
>+('PATRONYMIC', 'ÐÑÑÐµÑÑÐ²Ð¾',                               0, 0, 1, 1, ''),
>+('PROFESSION', 'ÐÑÐ¾ÑÐµÑÑÐ¸Ñ',                              1, 0, 1, 1, '');
>diff --git a/installer/data/mysql/uk-UA/optional/patron_atributes.sql b/installer/data/mysql/uk-UA/optional/patron_atributes.sql
>index ab42bc7..a2ad5d1 100644
>--- a/installer/data/mysql/uk-UA/optional/patron_atributes.sql
>+++ b/installer/data/mysql/uk-UA/optional/patron_atributes.sql
>@@ -1,17 +1,14 @@
> TRUNCATE borrower_attribute_types;
> 
>-INSERT INTO `borrower_attribute_types` (`code`, `description`, `repeatable`, `unique_id`, `opac_display`, `password_allowed`, `staff_searchable`, `authorised_value_category`) VALUES
>-('EDUCATION',  'ÐÑÐ²ÑÑÐ°',                               1, 0, 1, 0, 1, ''),
>-('EDU_INST',   'Ð£ÑÐ±Ð¾Ð²Ð¸Ð¹ Ð·Ð°ÐºÐ»Ð°Ð´',                       1, 0, 1, 0, 1, ''),
>-('ETHNICITY',  'ÐÑÐ½ÑÑÐ½Ð° Ð¿ÑÐ¸Ð½Ð°Ð»ÐµÐ¶Ð½ÑÑÑÑ',                0, 0, 1, 0, 1, ''),
>-('ETHNICNOTE', 'ÐÑÐ¸Ð¼ÑÑÐºÐ¸ ÑÐ¾Ð´Ð¾ ÐµÑÐ½ÑÑÐ½Ð¾Ñ Ð¿ÑÐ¸Ð½Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ', 0, 0, 1, 0, 1, ''),
>-('IDLDAP',     'ÐÐ´ÐµÐ½ÑÐ¸ÑÑÐºÐ°ÑÐ¾Ñ LDAP',                   0, 0, 0, 0, 1, ''),
>-('NATIONAL',   'ÐÐ°ÑÑÐ¾Ð½Ð°Ð»ÑÐ½ÑÑÑÑ',                       0, 0, 1, 0, 0, ''),
>-('PASSP_NO',   'Ð¡ÐµÑÑÑ ÑÐ° Ð½Ð¾Ð¼ÐµÑ Ð¿Ð°ÑÐ¿Ð¾ÑÑÐ°',              0, 0, 0, 0, 0, ''),
>-('PAS_IS_DAT', 'ÐÐ¾Ð»Ð¸ Ð²Ð¸Ð´Ð°Ð½Ð¾ Ð¿Ð°ÑÐ¿Ð¾ÑÑ',                  0, 0, 0, 0, 0, ''),
>-('PAS_IS_ORG', 'ÐÐµ Ð²Ð¸Ð´Ð°Ð½Ð¾ Ð¿Ð°ÑÐ¿Ð¾ÑÑ',                    0, 0, 0, 0, 0, ''),
>-('PATRONYMIC', 'ÐÐ¾ Ð±Ð°ÑÑÐºÐ¾Ð²Ñ',                          0, 0, 1, 0, 1, ''),
>-('PROFESSION', 'ÐÑÐ¾ÑÐµÑÑÑ',                             1, 0, 1, 0, 1, '');
>-  
>--- ('PASSP_NO',   'ÐÐ¾Ð¼ÐµÑ Ð¿Ð°ÑÐ¿Ð¾ÑÑÐ°',                       0, 0, 0, 0, 0, ''),
>--- ('PASSP_PREF', 'Ð¡ÐµÑÑÑ Ð¿Ð°ÑÐ¿Ð¾ÑÑÐ°',                       0, 0, 0, 0, 0, ''),  
>+INSERT INTO `borrower_attribute_types` (`code`, `description`, `repeatable`, `unique_id`, `opac_display`, `staff_searchable`, `authorised_value_category`) VALUES
>+('EDUCATION',  'ÐÑÐ²ÑÑÐ°',                               1, 0, 1, 1, ''),
>+('EDU_INST',   'Ð£ÑÐ±Ð¾Ð²Ð¸Ð¹ Ð·Ð°ÐºÐ»Ð°Ð´',                       1, 0, 1, 1, ''),
>+('ETHNICITY',  'ÐÑÐ½ÑÑÐ½Ð° Ð¿ÑÐ¸Ð½Ð°Ð»ÐµÐ¶Ð½ÑÑÑÑ',                0, 0, 1, 1, ''),
>+('ETHNICNOTE', 'ÐÑÐ¸Ð¼ÑÑÐºÐ¸ ÑÐ¾Ð´Ð¾ ÐµÑÐ½ÑÑÐ½Ð¾Ñ Ð¿ÑÐ¸Ð½Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ', 0, 0, 1, 1, ''),
>+('IDLDAP',     'ÐÐ´ÐµÐ½ÑÐ¸ÑÑÐºÐ°ÑÐ¾Ñ LDAP',                   0, 0, 0, 1, ''),
>+('NATIONAL',   'ÐÐ°ÑÑÐ¾Ð½Ð°Ð»ÑÐ½ÑÑÑÑ',                       0, 0, 1, 0, ''),
>+('PASSP_NO',   'Ð¡ÐµÑÑÑ ÑÐ° Ð½Ð¾Ð¼ÐµÑ Ð¿Ð°ÑÐ¿Ð¾ÑÑÐ°',              0, 0, 0, 0, ''),
>+('PAS_IS_DAT', 'ÐÐ¾Ð»Ð¸ Ð²Ð¸Ð´Ð°Ð½Ð¾ Ð¿Ð°ÑÐ¿Ð¾ÑÑ',                  0, 0, 0, 0, ''),
>+('PAS_IS_ORG', 'ÐÐµ Ð²Ð¸Ð´Ð°Ð½Ð¾ Ð¿Ð°ÑÐ¿Ð¾ÑÑ',                    0, 0, 0, 0, ''),
>+('PATRONYMIC', 'ÐÐ¾ Ð±Ð°ÑÑÐºÐ¾Ð²Ñ',                          0, 0, 1, 1, ''),
>+('PROFESSION', 'ÐÑÐ¾ÑÐµÑÑÑ',                             1, 0, 1, 1, '');
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 12267: 50122 | 50140 | 50573 | 50574