From 484b0d0142485194ab9aba496e2d7691c7d26057 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 6 Jan 2016 11:17:00 +0000 Subject: [PATCH] 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. --- koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt | 9 ++++++--- svc/localization | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) 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..16ef5e5 100644 --- 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,15 @@ type: 'PUT', url: '/cgi-bin/koha/svc/localization', success: function (data) { - if ( data.is_changed ) { + console.log(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 2bf3c69..95b1d28 100755 --- 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 => Encode::encode('utf-8', $localization->code), lang => Encode::encode('utf-8', $localization->lang), translation => Encode::encode('utf-8', $localization->translation), + is_changed => $is_changed, ); C4::Service->return_success( $response ); } -- 2.1.0