Show item at the end of person, account, organization wizard. Profile column for account tables. Profiles on person sheet.

1 files changed, 8 insertions, 3 deletions

diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py
index 3f7502c62..cc0371982 100644
--- a/ishtar_common/wizards.py
+++ b/ishtar_common/wizards.py
@@ -42,7 +42,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.utils.safestring import mark_safe
 
 from ishtar_common import models
-from ishtar_common.forms import CustomForm
+from ishtar_common.forms import CustomForm, reverse_lazy
 from ishtar_common.utils import get_all_field_names, MultiValueDict
 
 logger = logging.getLogger(__name__)
@@ -1375,6 +1375,7 @@ class PersonWizard(Wizard):
     model = models.Person
     wizard_templates = {
         'identity-person_creation': "ishtar/wizard/wizard_person.html"}
+    wizard_done_window = reverse_lazy('show-person')
 
 
 class PersonModifWizard(PersonWizard):
@@ -1397,6 +1398,7 @@ class IshtarUserDeletionWizard(DeletionWizard):
 
 class OrganizationWizard(Wizard):
     model = models.Organization
+    wizard_done_window = reverse_lazy('show-organization')
 
 
 class OrganizationModifWizard(OrganizationWizard):
@@ -1412,8 +1414,9 @@ class OrganizationDeletionWizard(DeletionWizard):
 
 
 class AccountWizard(Wizard):
-    formset_pop_deleted = False
     model = models.Person
+    formset_pop_deleted = False
+    wizard_done_window = reverse_lazy('show-person')
 
     def get_formated_datas(self, forms):
         datas = super(AccountWizard, self).get_formated_datas(forms)
@@ -1528,7 +1531,9 @@ class AccountWizard(Wizard):
             send_mail(subject, msg, settings.ADMINS[0][1],
                       [dct['email']], fail_silently=True)
         res = render(
-            self.request, 'ishtar/wizard/wizard_done.html', {},
+            self.request, self.wizard_done_template,
+            {'wizard_done_window': unicode(self.wizard_done_window),
+             'item': person},
         )
         return res