From 2acfc9b835b4a53c43e77f19de737ff213b64fa8 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Thu, 25 Oct 2018 23:10:51 +0000 Subject: [PATCH] Bug 13952: (follow-up) Fixing leftover merge conflict stuff There was some leftover stuff from a merge conflict messing with the JS, so I have fixed this up. The window now closes after export, as expected. Have noticed however that export breaks with authtypecodes that have a slash (/) in them. Will set to Assigned to fix this. Also need to add a fail message for when authtypecodes do not match on import. --- koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt index ae3f73c..30b214e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt @@ -233,15 +233,10 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] -<<<<<<< HEAD [% Asset.js("js/admin-menu.js") | $raw %]