From 547198124ce0df3c91c576109f4476777e00441a Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Fri, 26 Feb 2021 13:39:37 -0800 Subject: [PATCH] Bug 26964: Newly created macros should be selected in the Advanced editor The problem is that the newly created macro isn't selected, because the return values from the call to create it are accidentally thrown away. There isn't actually any option to save, just a timeout that automatically saves, but you can tell you are in this broken state because the Delete macro button is disabled. Test plan: 1. Prior to applying the patch, Administration - set the preference EnableAdvancedCatalogingEditor to Enable 2. Cataloging - Advanced editor - Macros... - New macro... 3. Give it a name, click OK, notice that the Delete macro button is disabled 4. Apply patch, shift+reload 5. Macros... - New macro... 6. Give it a name, click OK, notice that the Delete macro button is enabled 7. Type something in the editor, delete 999 will do nicely, wait half a second to see Saved appear at the far right, close the macro popup 8. Macros..., click the name of your macro, verify it really was saved Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit f17d3dd62cfcbe7de3b74573b48e09e42e6b0eab) Signed-off-by: Fridolin Somers (cherry picked from commit 4073805058c7a1932258cd6f61b6928bcf9a4bbc) Signed-off-by: Andrew Fuerste-Henry --- koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc index 8a379def53..cf244a40ea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc @@ -880,7 +880,7 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr }) }; $.ajax(options) - .then(function(undef, result) { + .then(function(result) { showSavedMacros(); loadMacro( result.name, result.macro_id ); }) -- 2.39.5