[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.04-77-g88e14c0

Git repo owner gitmaster at git.koha-community.org
Mon Mar 14 11:08:18 CET 2016


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, 3.22.x has been updated
       via  88e14c04e502eca1242598d4d33de3e3ad49f5c0 (commit)
       via  7847081c526e701da2cdbff231c74eb09782bfe5 (commit)
       via  0483a13d26001a6c09ff99aac2c62903192380a3 (commit)
      from  7899e93dbba41860743aa90a1d2d6e305fa7c2e2 (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 88e14c04e502eca1242598d4d33de3e3ad49f5c0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Dec 30 17:19:02 2015 +0000

    Bug 15446: Update systempreferences rows where type=YesNo and value=''
    
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Amended to fix typo in sql statement.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jesse Weaver <jweaver at bywatersolutions.com>
    (cherry picked from commit 1427cacfe74e4cdc3a4aa4d400e3b02305dfc6ec)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 7847081c526e701da2cdbff231c74eb09782bfe5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Dec 30 17:15:31 2015 +0000

    Bug 15446: Rename Koha::Object[s]->type with _type
    
    In a few case (at least systempreferences and export_format (csv profiles),
    the type method of Koha::Object and Koha::Objects can be in conflict with the
    column names.
    Indeed systempreferences.type exists and so the method will return
    'Systempreference' (the name of the module) instead of the value of the row in
    DB.
    
    I have found at least 1 place where it can cause issue:
    In C4::Context->set_preference:
     601     my $syspref = Koha::Config::SysPrefs->find( $var );
     602     my $type = $syspref ? $syspref->type() : undef;
     603
     604     $value = 0 if ( $type && $type eq 'YesNo' && $value eq '' );
    
    type will always be 'Systempreference' and the YesNo pref will be set to an
    empty string '' instead of 0.
    
    I am not sure about the consequences of this, but it is preferable to
    fix it ASAP.
    
    To reproduce:
    0/ Do not apply this patch
    1/ Edit a YesNo prefs, AutoEmailOpacUser for instance
    2/ Set it to "Don't sent"
    3/ Check the value in DB, it should be set to an empty string, instead
    of 0
    4/ Apply this patch and try again. Now the value should be 0
    
    Followed test plan, value is now 0 as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jesse Weaver <jweaver at bywatersolutions.com>
    (cherry picked from commit de3289506dcda91510dc9c7a867558a29ebefd57)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Conflicts:
    	Koha/Branch.pm
    	Koha/Branches.pm

commit 0483a13d26001a6c09ff99aac2c62903192380a3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Dec 30 17:11:45 2015 +0000

    Bug 15446: Add tests
    
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jesse Weaver <jweaver at bywatersolutions.com>
    (cherry picked from commit bd7e79940d548c417580bb79a2f250751fc4575c)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

-----------------------------------------------------------------------

Summary of changes:
 Koha/AudioAlert.pm                              |    2 +-
 Koha/AudioAlerts.pm                             |    2 +-
 Koha/AuthorisedValue.pm                         |    2 +-
 Koha/AuthorisedValues.pm                        |    2 +-
 Koha/Biblio.pm                                  |    2 +-
 Koha/Biblioitem.pm                              |    2 +-
 Koha/Biblioitems.pm                             |    2 +-
 Koha/Biblios.pm                                 |    2 +-
 Koha/Borrower.pm                                |    2 +-
 Koha/Borrowers.pm                               |    2 +-
 Koha/Branch.pm                                  |    2 +-
 Koha/Branches.pm                                |    2 +-
 Koha/Cities.pm                                  |    2 +-
 Koha/City.pm                                    |    2 +-
 Koha/Config/SysPref.pm                          |    2 +-
 Koha/Config/SysPrefs.pm                         |    2 +-
 Koha/Hold.pm                                    |    2 +-
 Koha/Holds.pm                                   |    2 +-
 Koha/Item.pm                                    |    2 +-
 Koha/Items.pm                                   |    2 +-
 Koha/Localization.pm                            |    2 +-
 Koha/Localizations.pm                           |    2 +-
 Koha/Object.pm                                  |   22 +++++++++++-----------
 Koha/Objects.pm                                 |   14 ++++++--------
 Koha/Patron/Categories.pm                       |    2 +-
 Koha/Patron/Category.pm                         |    2 +-
 Koha/Virtualshelf.pm                            |    2 +-
 Koha/Virtualshelfcontent.pm                     |    2 +-
 Koha/Virtualshelfcontents.pm                    |    2 +-
 Koha/Virtualshelfshare.pm                       |    2 +-
 Koha/Virtualshelfshares.pm                      |    2 +-
 Koha/Virtualshelves.pm                          |    2 +-
 installer/data/mysql/atomicupdate/bug_15446.sql |    1 +
 t/db_dependent/Context.t                        |    5 +++++
 34 files changed, 53 insertions(+), 49 deletions(-)
 create mode 100644 installer/data/mysql/atomicupdate/bug_15446.sql


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list