From 7b0b46c19cf61d18a426ce1357c1eb326b839416 Mon Sep 17 00:00:00 2001 From: Alex Arnaud Date: Wed, 24 Jan 2018 09:37:57 +0000 Subject: [PATCH] Bug 17047 - Fix retrieving Mana token Rebased-by: Alex Arnaud (2018-07-04) Signed-off-by: Michal Denar Signed-off-by: Michal Denar --- koha-tmpl/intranet-tmpl/lib/jquery/activatemana.js | 6 ++---- koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt | 1 + .../prog/en/modules/admin/preferences/web_services.pref | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/lib/jquery/activatemana.js b/koha-tmpl/intranet-tmpl/lib/jquery/activatemana.js index 49adfdd..0e9b2e2 100644 --- a/koha-tmpl/intranet-tmpl/lib/jquery/activatemana.js +++ b/koha-tmpl/intranet-tmpl/lib/jquery/activatemana.js @@ -10,10 +10,8 @@ $(document).ready(function(){ dataType: "json", }) .done(function(result){ - console.log(result.token); - $("#pref_ManaToken").val(result.token); - $("#pref_ManaToken").trigger("input"); - }).fail( function( result ){ + $("#pref_ManaToken").val(result.token); + $("#pref_ManaToken").trigger("input"); }); return false; }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt index 6cc0570..d9d705c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt @@ -197,6 +197,7 @@ [% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %] [% Asset.js("js/ajax.js") | $raw %] [% Asset.js("js/pages/preferences.js") | $raw %] + [% Asset.js("lib/jquery/activatemana.js") | $raw %] [%# Add WYSIWYG editor for htmlarea system preferences %] [% INCLUDE 'wysiwyg-systempreferences.inc' %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref index 74015e2..fe4a942 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref @@ -71,7 +71,7 @@ Web services: - "Security token used to authenticate on mana:" - pref: ManaToken class: Text - -
You need a security token to authenticate on Mana. If this sytem preference is empty, please fill in the following form, you will receive an email to confirm and activate your token.
First name
Last name
Email address
+ -
You need a security token to authenticate on Mana. If this sytem preference is empty, please fill in the following form, you will receive an email to confirm and activate your token.
First name
Last name
Email address
- - 'Fields automatically shared with mana' - pref: AutoShareWithMana -- 2.7.4