[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.17-3-g8c47d3b

[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  8c47d3bd2bb5b8d267bdac545b6c44463a581fa1 (commit)
       via  c9f81961d5a1d4ac062cf2565b86dbbe5dcb3e94 (commit)
       via  82559d5ad55e4f057f795b7afc570bae963150fd (commit)
      from  ccf341a5e66a3b5b25dd685d4c7ec47d9ff7807c (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 8c47d3bd2bb5b8d267bdac545b6c44463a581fa1
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Wed Mar 15 11:38:28 2017 +0100

    Bug 18111: Follow-up for 3.22.x
    
    Replace [% frameworkcode %] by 'default' wherever needed

commit c9f81961d5a1d4ac062cf2565b86dbbe5dcb3e94
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Sat Feb 18 23:06:16 2017 -0500

    Bug 18111: Swap framework_name and frameworkcode
    
    With the frameworkcode changed to an empty string, which really
    is closer to the physical reality, some javascript somewhere
    breaks. This means the spinner does not appear when you confirm
    that you wish to import it.
    
    TEST PLAN
    ----------
    1) apply first patch
    2) export default framework, doesn't matter format
    3) import default framework using that file.
    4) answer yes or whatever it is.
       -- spinner does not appear.
    5) apply this patch
    6) import default framework use the same file.
    7) answer yes or whatever it is.
       -- spinner does appear.
    8) decide if you wish to find and fix the javascript conditions.
       if yes -- do so, and then obsolete this once you have.
       if not -- sign this off after running koha qa test tools
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Signed-off-by: Mason James <mtj at kohaaloha.com>
    (cherry picked from commit 3b4e164903ec532ad616d7e9021719bbd00b292e)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 82559d5ad55e4f057f795b7afc570bae963150fd
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Feb 14 16:21:45 2017 +0000

    Bug 18111: Fix import of default framework
    
    Caused by bug 16035.
    
    Recreate the issue:
    Go to Home › Administration › MARC frameworks
    For the default framework: Actions > import
    It will not work
    
    Test plan:
    Confirm test plans from bug 16035 and bug 17389 still pass
    Confirm that the import for the default framework now works
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Signed-off-by: Mason James <mtj at kohaaloha.com>
    (cherry picked from commit 07eefd02ba363c6072b6370e4360a91360e31ab2)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

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

Summary of changes:
 admin/import_export_framework.pl                   |   19 +++++-------
 .../prog/en/modules/admin/biblio_framework.tt      |   32 ++++++++++----------
 2 files changed, 24 insertions(+), 27 deletions(-)


hooks/post-receive
-- 
main Koha release repository