[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.06-93-g0a590fb

[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, 3.22.x has been updated
       via  0a590fb054f6a11ed6bfb76c5b31c6cbc07ffa8f (commit)
       via  09a7c74306d4787c832d27a2fa13fc02b9c097a2 (commit)
      from  83b1f1226e39f191689dfe6818d5adb958c262b3 (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 0a590fb054f6a11ed6bfb76c5b31c6cbc07ffa8f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri May 13 22:03:08 2016 +0100

    Bug 1859: Do not display <<>> if an entry without value is selected
    
    For instance there are ---TABLES--- to delimite fields' tables, if
    selected we do not want to add "<<>>" to the letter.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 2c332513ffd421af6b23ebf30474f5baeac8ba6f)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 09a7c74306d4787c832d27a2fa13fc02b9c097a2
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu May 12 20:35:01 2016 -0400

    Bug 1859 - Notice fields: can't select multiple fields at once
    
    When selecting database fields to appear in a notice, selecting multiple
    fields at once doesn't work correctly. The selected fields are grouped
    together between << and >> instead of each being bracketed separately.
    
    This patch corrects this problem. Also changed: Removal of 'onclick';
    Conversion of 'insert' button to a Bootstrap buttons styled with a Font
    Awesome icon; HTML validation error fixes.
    
    To test, apply the patch and go to Tools -> Notices & Slips.
    
    - Edit any notice.
    - Select a notice version to edit (Email, Print, etc.).
    - Confirm that the "Insert" button looks correct.
    - Using ctrl+click, select multiple database fields to add to the
      notice. Confirm that clicking the "Insert" button adds the fields
      correctly.
    - Confirm that there are no HTML validation errors.
    
    Signed-off-by: Nicole C Engard <nengard at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 9b99d7810176726fe28c65d17c7f93dcd95cdd09)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

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

Summary of changes:
 .../intranet-tmpl/prog/en/modules/tools/letter.tt  |   35 +++++++++++---------
 1 file changed, 20 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
main Koha release repository