Attachment 60438 Details for Bug 18111 – [SIGNED-OFF] Bug 18111: Swap framework_name and frameworkcode

[patch] [SIGNED-OFF] Bug 18111: Swap framework_name and frameworkcode

SIGNED-OFF-Bug-18111-Swap-frameworkname-and-framew.patch (text/plain), 2.92 KB, created by Josef Moravec on 2017-02-19 20:41:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Moravec

Created: 2017-02-19 20:41:46 UTC

Size: 2.92 KB

patch

obsolete

>From 920341ce06dd860e825a546af5809cbe02ca6d8d Mon Sep 17 00:00:00 2001
>From: Mark Tompsett <mtompset@hotmail.com>
>Date: Sat, 18 Feb 2017 23:06:16 -0500
>Subject: [PATCH] [SIGNED-OFF] 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@gmail.com>
>---
> admin/import_export_framework.pl                                  | 4 ++--
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/admin/import_export_framework.pl b/admin/import_export_framework.pl
>index 60dcf7f..b2d090d 100755
>--- a/admin/import_export_framework.pl
>+++ b/admin/import_export_framework.pl
>@@ -46,8 +46,8 @@ unless ($authenticated) {
>     exit 0;
> }
> 
>-my $frameworkcode = $input->param('frameworkcode') || '';
>-my $framework_name = $frameworkcode || 'default';
>+my $framework_name = $input->param('frameworkcode') || 'default';
>+my $frameworkcode = ($framework_name eq 'default') ? q{} : $framework_name;
> my $action = $input->param('action') || 'export';
> 
> ## Exporting
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
>index 20efbc1..4edc861 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
>@@ -189,7 +189,7 @@
>               </div>
>               <form action="/cgi-bin/koha/admin/import_export_framework.pl" name="form_i_default" id="form_i_default" method="post" enctype="multipart/form-data" class="form_import">
>                 <div class="modal-body">
>-                  <input type="hidden" name="frameworkcode" value="" />
>+                  <input type="hidden" name="frameworkcode" value="default" />
>                   <input type="hidden" name="action" value="import" />
>                   <p><label for="file_import_default">Upload file:</label> <input type="file" name="file_import_default" id="file_import_default" class="input_import" /></p>
>                     <div id="importing_default" style="display:none" class="importing"><img src="[% interface %]/[% theme %]/img/spinner-small.gif" alt="" /><span class="importing_msg"></span></div>
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 18111: 60216 | 60239 | 60436 | 60437 | 60438 | 60522 | 60523 | 61099