Bug 15477: (follow-up) Bug 14100: Better errors handling

On bug 14100, the patch "Better errors handling" introduced an ...
error.
The user always get "An error occurred when updating this translation"
although it has been updated in DB.

Test plan:
Edit translations for an item type: you should not get an error when
everything went fine.

Tested on top of 15487, error message does no longer appear.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt
index 2730a08..2d6e5b4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt
@@ -53,12 +53,14 @@
             type: 'PUT',
             url: '/cgi-bin/koha/svc/localization',
             success: function (data) {
-                if ( data.is_changed ) {
+                if ( data.error ) {
+                    $(cell).css('background-color', '#FF0000');
+                    show_message({ type: 'error_on_update', data: data });
+                } else if ( data.is_changed == 1 ) {
                     $(cell).css('background-color', '#00FF00');
                     show_message({ type: 'success_on_update', data: data });
-                } else {
-                    show_message({ type: 'error_on_update', data: data });
                 }
+
                 if ( $(cell).hasClass('lang') ) {
                     $(cell).text(data.lang)
                 } else if ( $(cell).hasClass('translation') ) {

diff --git a/svc/localization b/svc/localization
index 1f10f67..e0f362d 100755 (executable)
--- a/svc/localization
+++ b/svc/localization
@@ -37,7 +37,9 @@ sub update_translation {
         $localization->translation( $translation )
     }
     my %params;
+    my $is_changed;
     if ( $localization->is_changed ) {
+        $is_changed = 1;
         unless ( Koha::Localizations->search( { entity => $localization->entity, code => $localization->code, lang => $lang, localization_id => { '!=' => $localization->localization_id }, } )->count ) {
             $localization->store;
         } else {
@@ -52,6 +54,7 @@ sub update_translation {
         code        => $localization->code,
         lang        => $localization->lang,
         translation => $localization->translation,
+        is_changed  => $is_changed,
     );
     C4::Service->return_success( $response );
 }