From f8b24adc75ef145b96556893d555de4971b8251d Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Mon, 29 Apr 2019 03:30:30 +0000 Subject: [PATCH] Bug 8558: Improve confirmation message for importing frameworks This patch updates the confirmation message from: "Do you really want to import the framework fields and subfields? This will overwrite the current configuration. For safety reasons please use the export option to make a backup" to: "Are you sure you want to import the [% frameworkcode %] framework structure? This will overwrite the current configuration. For safety reasons, it is recommended to use the export option to make a backup first." To test: 1) Go to Administration -> MARC bibliographic frameworks 2) Export one of the frameworks 3) Create a new test framework 4) Import the new test framework structure using the exported file 5) Upon clicking Confirm, confirm the message is improved and makes sense. Sponsored-by: Catalyst IT Signed-off-by: Liz Rea Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize (cherry picked from commit e4d1318550af78f76b7a43757bbdc4c5bddb4d5f) Signed-off-by: Fridolin Somers --- .../intranet-tmpl/prog/en/modules/admin/biblio_framework.tt | 3 +-- koha-tmpl/intranet-tmpl/prog/js/biblio_framework.js | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) 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 b9814ab09f..c94398cdde 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 @@ -258,7 +258,7 @@ @@ -291,7 +291,6 @@ /* Set some variable needed in biblio_framework.js */ var MSG_IMPORT_ERROR = _("Error importing the framework"); var MSG_SELECT_FILE_FORMAT = _("Please select a CSV (.csv), ODS (.ods) or XML (.xml) spreadsheet file."); - var MSG_OVERWRITE_WARNING = _("Do you really want to import the framework fields and subfields? This will overwrite the current configuration. For safety reasons please use the export option to make a backup"); var MSG_IMPORTING_TO_FRAMEWORK = _("Importing to framework: %s. Importing from file: %s."); var template_path = "[% interface | html %]/[% theme | html %]"; diff --git a/koha-tmpl/intranet-tmpl/prog/js/biblio_framework.js b/koha-tmpl/intranet-tmpl/prog/js/biblio_framework.js index 15dd1f77d2..6c7427fdf9 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/biblio_framework.js +++ b/koha-tmpl/intranet-tmpl/prog/js/biblio_framework.js @@ -52,8 +52,9 @@ var id = $(this).attr('id'); var obj = $('#' + id + ' input:file'); if (/(?:\.csv|\.ods|\.xml)$/.test(obj.val())) { + var frameworkcode = $('#' + id + ' input:hidden[name=frameworkcode]').val(); + var MSG_OVERWRITE_WARNING = _("Are you sure you want to import the " + frameworkcode + " framework structure? This will overwrite the current configuration. For safety reasons, it is recommended to use the export option to make a backup first."); if (confirm( MSG_OVERWRITE_WARNING )) { - var frameworkcode = $('#' + id + ' input:hidden[name=frameworkcode]').val(); $('#importing_' + frameworkcode).find("span").html(MSG_IMPORTING_TO_FRAMEWORK.format("" + frameworkcode + "", "" + obj.val().replace(new RegExp("^.+[/\\\\]"),"") + "")); if (navigator.userAgent.toLowerCase().indexOf('msie') != -1) { var timestamp = new Date().getTime(); -- 2.39.5