[koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-768-g96ac578

[Git repo owner]

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  96ac578960cb4f2c5a964b3ac7fa4f9ba676b95d (commit)
       via  2d32ab38148f7d75412a36e928dea799717bc5fb (commit)
      from  0397e7ea64c208c140d7178ed34c3bd4b266fcfb (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 96ac578960cb4f2c5a964b3ac7fa4f9ba676b95d
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date:   Fri May 31 10:17:08 2013 +0200

    Bug 10384: fall back to normal authentication if LDAP server is not available
    
    This fixes a bug where, assuming LDAP authentication is enabled, if a user
    tries to log in while the LDAP server is down, the following fatal error
    is displayed:
    
    Can't call method "bind" on an undefined value at C4/Auth_with_ldap.pm line 134, <DATA> line 558.
    
    This patch catches this error to allow normal authentication when LDAP connexion fails.
    
    Test plan :
    - Configure LDAP connexion with a host not having LDAP. ie :
     <useldapserver>1</useldapserver>
     <ldapserver id="ldapserver">
        <hostname>localhost</hostname>
        <base>dc=test,dc=com</base>
        <user>cn=Manager,dc=test,dc=com</user>
        <pass>passwd</pass>
        <replicate>0</replicate>
        <update>0</update>
        <auth_by_bind>0</auth_by_bind>
        <mapping>
          <firstname    is="givenname"      ></firstname>
          <surname      is="sn"             ></surname>
          <branchcode   is="branch"         >MAIN</branchcode>
          <userid       is="uid"            ></userid>
          <password     is="userpassword"   ></password>
          <email        is="mail"           ></email>
          <categorycode is="employeetype"   >PT</categorycode>
        </mapping>
     </ldapserver>
    - Try to connect with mysql user (defined in koha-conf.xml)
    - Try to connect with a user defined in borrowers
    You may try to connect with working LDAP connexion
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

commit 2d32ab38148f7d75412a36e928dea799717bc5fb
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Apr 17 09:33:55 2013 -0400

    Bug 9533: batch item modification form now shows default field values only by request
    
    This patch makes the pre-population of the fields for the batch
    item editor with the default values from the default framework
    optional and off by default.
    
    Test Plan:
    1) Apply patch
    2) Add default values for cost and replacement cost to the
       default framework.
    3) Browse to Tools / Batch item modification
    4) Choose a file, or entire some barcodes in the text area
    5) Ensure that the 'Populate fields with default values from default
       framework' is *not* checked
    6) Click 'Continue'
    7) Observe that the fields for cost and replacement cost are blank
    8) Click the 'back' button on your browser
    9) Check the checkbox to enable the default value
    10) Click 'Continue'
    11) Observe that the fields for cost and replacement cost now contain
        the default values you assigned them in the default MARC framework
    
    Signed-off-by: David Cook <dcook at prosentient.com.au>
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Switch works correctly, all tests and QA script pass.
    
    Note: there is a bug with default values for all non text input
    fields. Default values won't be applied for those fields as the
    pull downs are not preselected correctly with the default values
    defined in the framework.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 C4/Auth_with_ldap.pm                               |    5 +++++
 .../prog/en/modules/tools/batchMod.tt              |   14 ++++++++++++++
 tools/batchMod.pl                                  |    7 +++----
 3 files changed, 22 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository