diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-24 18:31:41 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-24 18:31:41 +0200 |
| commit | 3c09635be25d4dc25893fb08079582f90b68f5ec (patch) | |
| tree | 33d58e313aeb6a172aebc7e5b15f4293f2dc0cbf /ishtar_common/views.py | |
| parent | f82196f53fce2b42ac90a8fa568caf55faa8e523 (diff) | |
| parent | 92cd2721bc4e86812fe4028b1fb320bfe3157332 (diff) | |
| download | Ishtar-3c09635be25d4dc25893fb08079582f90b68f5ec.tar.bz2 Ishtar-3c09635be25d4dc25893fb08079582f90b68f5ec.zip | |
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'ishtar_common/views.py')
| -rw-r--r-- | ishtar_common/views.py | 13 |
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" % ( |