summaryrefslogtreecommitdiff
path: root/ishtar_common/views.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-08-24 18:23:28 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-08-24 18:23:28 +0200
commit4404bafa193a37517f43932de4dafcb763b9f709 (patch)
tree2667d79b42cc993d0668317e3100a237fa33ce4d /ishtar_common/views.py
parent01dacc332490e462fd7a1fa817b293a7398d2307 (diff)
parentae8a81de6b6786518027ccd8f09e825d107be5e7 (diff)
downloadIshtar-4404bafa193a37517f43932de4dafcb763b9f709.tar.bz2
Ishtar-4404bafa193a37517f43932de4dafcb763b9f709.zip
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/views.py')
-rw-r--r--ishtar_common/views.py13
1 files changed, 12 insertions, 1 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index bbe790efa..79d3054b3 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -143,6 +143,16 @@ organization_modification_wizard = wizards.OrganizationModifWizard.as_view(
label=_(u"Organization modification"),
url_name='organization_modification')
+
+def organization_modify(request, pk):
+ organization_modification_wizard(request)
+ wizards.OrganizationModifWizard.session_set_value(
+ request, 'selec-organization_modification', 'pk', pk, reset=True)
+ return redirect(
+ reverse('organization_modification',
+ kwargs={'step': 'identity-organization_modification'}))
+
+
organization_deletion_wizard = wizards.OrganizationDeletionWizard.as_view(
[('selec-organization_deletion', forms.OrganizationFormSelection),
('final-organization_deletion', FinalDeleteForm)],
@@ -692,7 +702,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
new_vals.append(u"{}{}{}".format(
vals[idx], u' - ', format_val(v)))
my_vals = new_vals[:]
- data.append(", ".join(my_vals) or u"")
+ data.append(" ; ".join(my_vals) or u"")
datas.append(data)
if manual_sort_key:
# +1 because the id is added as a first col
@@ -793,6 +803,7 @@ def show_item(model, name, extra_dct=None):
url_name = u"/".join(reverse('show-' + name, args=['0', '']
).split('/')[:-2]) + u"/"
dct['CURRENCY'] = get_current_profile().currency
+ dct['ENCODING'] = settings.ENCODING
dct['current_window_url'] = url_name
date = 'date' in dct and dct.pop('date')
dct['window_id'] = "%s-%d-%s" % (