From 2991b96c9c90d7ddf214cfee05940d72fbdc4617 Mon Sep 17 00:00:00 2001 From: Serghei MIHAI Date: Tue, 19 Aug 2014 12:41:21 +0200 Subject: [PATCH] dossiers: notification displayed when updates done on patient addresses/contacts Closes #4807 --- calebasse/dossiers/views.py | 5 +++++ calebasse/static/js/calebasse.dialog.js | 4 +++- calebasse/static/js/calebasse.dossiers.js | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/calebasse/dossiers/views.py b/calebasse/dossiers/views.py index 0f2f811..dc09dec 100644 --- a/calebasse/dossiers/views.py +++ b/calebasse/dossiers/views.py @@ -99,6 +99,11 @@ class UpdatePatientContactView(RecordPatientRecordIdMixing, cbv.UpdateView): template_name = 'dossiers/patientcontact_new.html' success_url = '../../view#tab=2' + def form_valid(self, form): + valid = super(UpdatePatientContactView, self).form_valid(form) + messages.info(self.request, u'Modification enregistrée avec succès') + return valid + update_patient_contact = UpdatePatientContactView.as_view() class DeletePatientContactView(cbv.DeleteView): diff --git a/calebasse/static/js/calebasse.dialog.js b/calebasse/static/js/calebasse.dialog.js index ff207bd..265bdbd 100644 --- a/calebasse/static/js/calebasse.dialog.js +++ b/calebasse/static/js/calebasse.dialog.js @@ -17,7 +17,7 @@ function enable_button(button) { $button.removeAttr('disabled'); } -function generic_ajaxform_dialog(url, title, id, width, btn_submit_name, redirectToUrl, on_load_callback, height, extra_button) { +function generic_ajaxform_dialog(url, title, id, width, btn_submit_name, redirectToUrl, on_load_callback, height, extra_button, replace_content) { if (! height) height = 'auto'; $(id).load(url, @@ -33,6 +33,8 @@ function generic_ajaxform_dialog(url, title, id, width, btn_submit_name, redirec $(id + ' form').ajaxForm({ success: onsuccess, }); + } else if(replace_content) { + $('body').html(parse); } else { if (redirectToUrl) { if (redirectToUrl.indexOf('#') == 0) { diff --git a/calebasse/static/js/calebasse.dossiers.js b/calebasse/static/js/calebasse.dossiers.js index 0939b44..9baff37 100644 --- a/calebasse/static/js/calebasse.dossiers.js +++ b/calebasse/static/js/calebasse.dossiers.js @@ -227,7 +227,7 @@ function load_tab3_addresses() { }); $('.update-contact-btn').click(function() { generic_ajaxform_dialog('contact/' + $(this).data('id') + '/update', 'Modifier un contact', - '#ajax-dlg', '800px', 'Modifier', null, nir_check); + '#ajax-dlg', '800px', 'Modifier', null, nir_check, null, null, true); }); $('.del-contact').click(function() { generic_ajaxform_dialog('contact/' + $(this).data('id') + '/del?address=' + $(this).data('address-id'), @@ -239,7 +239,7 @@ function load_tab3_addresses() { }); $('.update-address-btn').click(function() { generic_ajaxform_dialog('address/' + $(this).data('id') + '/update', 'Modifier une adresse', - '#ajax-dlg', '600px', 'Modifier'); + '#ajax-dlg', '600px', 'Modifier', null, null, null, null, true); }); $('.del-address').click(function() { generic_ajaxform_dialog('address/' + $(this).data('id') + '/del', 'Supprimer une addresse', -- 2.1.0