From 3b4e164903ec532ad616d7e9021719bbd00b292e Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Sat, 18 Feb 2017 23:06:16 -0500 Subject: [PATCH] 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 Signed-off-by: Tomas Cohen Arazi Signed-off-by: Mason James --- admin/import_export_framework.pl | 4 ++-- .../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 60dcf7fe58..b2d090dad6 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 714d4fb810..50cd4b2133 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 @@ -183,7 +183,7 @@