Revert "Bug 23075: Better error handling in Mana config"

This reverts commit adb30fb8a0347ab6ff391238a8bd1ce4b6931fcd.

We missed some cases that means this handling was throwing out perfectly
accepable requests.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

diff --git a/Koha/SharedContent.pm b/Koha/SharedContent.pm
index 80b4309..580fef2 100644 (file)
--- a/Koha/SharedContent.pm
+++ b/Koha/SharedContent.pm
@@ -60,13 +60,6 @@ sub process_request {
 
     my $response = $userAgent->request($mana_request);
 
-    if ( $response->code != 200 ) {
-        return {
-            code => $response->code,
-            msg  => $response->message,
-        };
-    }
-
     eval { $result = from_json( $response->decoded_content, { utf8 => 1} ); };
     $result->{code} = $response->code;
     if ( $@ ){

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
index df8599e..11d4e6c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
@@ -19,7 +19,7 @@
             <div class="col-sm-6">
                 [% IF result.code != 201 && result.msg %]
                     <div class="dialog alert" role="alert">
-                        Error trying to connect or read response from the Mana server (Code: [% result.code | html %]) [% result.msg | html %]
+                        [% result.msg | html %]
                     </div>
                 [% END %]