From b1f5bad2ddaebe2dd9943333d7efd131f63896e9 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Tue, 16 Aug 2016 16:57:14 +0200
Subject: Account management: fix edit - can delete an account (refs #2977)

---
 ishtar_common/urls.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'ishtar_common/urls.py')

diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py
index a3bcaffb5..30b5741d9 100644
--- a/ishtar_common/urls.py
+++ b/ishtar_common/urls.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010-2015 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2010-2016 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -81,9 +81,15 @@ urlpatterns = patterns(
         check_rights(['change_organization', 'change_own_organization'])(
             views.OrganizationPersonEdit.as_view()),
         name='organization_person_edit'),
+    url(r'get-ishtaruser/(?P<type>.+)?$',
+        views.get_ishtaruser,
+        name='get-ishtaruser'),
     url(r'account_management/(?P<step>.+)?$',
         check_rights(['add_ishtaruser'])(
             views.account_management_wizard), name='account_management'),
+    url(r'account_deletion/(?P<step>.+)?$',
+        check_rights(['add_ishtaruser'])(
+            views.account_deletion_wizard), name='account_deletion'),
     url(r'^import-new/$',
         check_rights(['change_import'])(
             views.NewImportView.as_view()), name='new_import'),
-- 
cgit v1.2.3


From 49e0c676d0673111ed35783af6cf66803e034665 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Tue, 16 Aug 2016 17:52:02 +0200
Subject: Person - Organization: add full export (refs #3039)

---
 ishtar_common/forms.py        |  2 +-
 ishtar_common/forms_common.py | 11 +++++++----
 ishtar_common/urls.py         |  4 ++++
 3 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'ishtar_common/urls.py')

diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py
index 5e0d14eb8..b851c95b2 100644
--- a/ishtar_common/forms.py
+++ b/ishtar_common/forms.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010-2015 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2010-2016 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py
index a9873cb0a..6fdee55cb 100644
--- a/ishtar_common/forms_common.py
+++ b/ishtar_common/forms_common.py
@@ -208,8 +208,10 @@ class OrganizationFormSelection(forms.Form):
     currents = {'pk': models.Organization}
     pk = forms.IntegerField(
         label="",
-        widget=widgets.JQueryJqGrid(reverse_lazy('get-organization'),
-                                    OrganizationSelect, models.Organization),
+        widget=widgets.JQueryJqGrid(
+            reverse_lazy('get-organization'), OrganizationSelect,
+            models.Organization,
+            source_full=reverse_lazy('get-organization-full')),
         validators=[models.valid_id(models.Organization)])
 
 
@@ -245,8 +247,9 @@ class PersonFormSelection(forms.Form):
     currents = {'pk': models.Person}
     pk = forms.IntegerField(
         label="",
-        widget=widgets.JQueryJqGrid(reverse_lazy('get-person'),
-                                    PersonSelect, models.Person),
+        widget=widgets.JQueryJqGrid(
+            reverse_lazy('get-person'), PersonSelect, models.Person,
+            source_full=reverse_lazy('get-person-full')),
         validators=[models.valid_id(models.Person)])
 
 
diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py
index 30b5741d9..daaac77e3 100644
--- a/ishtar_common/urls.py
+++ b/ishtar_common/urls.py
@@ -139,6 +139,8 @@ urlpatterns += patterns(
         name='autocomplete-person-permissive'),
     url(r'get-person/(?P<type>.+)?$', 'get_person',
         name='get-person'),
+    url(r'get-person-full/(?P<type>.+)?$', 'get_person',
+        name='get-person-full', kwargs={'full': True}),
     url(r'show-person(?:/(?P<pk>.+))?/(?P<type>.+)?$',
         'show_person', name='show-person'),
     url(r'department-by-state/(?P<state_id>.+)?$', 'department_by_state',
@@ -158,6 +160,8 @@ urlpatterns += patterns(
         'new_organization', name='new-organization'),
     url(r'get-organization/(?P<type>.+)?$', 'get_organization',
         name='get-organization'),
+    url(r'get-organization-full/(?P<type>.+)?$', 'get_organization',
+        name='get-organization-full', kwargs={'full': True}),
     url(r'show-organization(?:/(?P<pk>.+))?/(?P<type>.+)?$',
         'show_organization', name='show-organization'),
     url(r'autocomplete-organization/([0-9_]+)?$',
-- 
cgit v1.2.3