diff options
Diffstat (limited to 'archaeological_finds/wizards.py')
| -rw-r--r-- | archaeological_finds/wizards.py | 63 |
1 files changed, 44 insertions, 19 deletions
diff --git a/archaeological_finds/wizards.py b/archaeological_finds/wizards.py index 42f5f47c6..b34bcdcbe 100644 --- a/archaeological_finds/wizards.py +++ b/archaeological_finds/wizards.py @@ -22,7 +22,8 @@ from django.core.exceptions import ObjectDoesNotExist, PermissionDenied from django.utils.translation import ugettext_lazy as _, pgettext from ishtar_common.forms import reverse_lazy -from ishtar_common.wizards import Wizard, DeletionWizard, SearchWizard +from ishtar_common.wizards import Wizard, DeletionWizard, SearchWizard, \ + MultipleDeletionWizard from archaeological_operations.wizards import OperationAdministrativeActWizard from archaeological_operations.models import AdministrativeAct @@ -37,6 +38,7 @@ class FindSearch(SearchWizard): class FindWizard(Wizard): model = models.Find wizard_done_window = reverse_lazy('show-find') + redirect_url = "find_modification" def get_current_contextrecord(self): step = self.steps.current @@ -107,7 +109,7 @@ class FindModificationWizard(FindWizard): } -class FindDeletionWizard(DeletionWizard): +class FindDeletionWizard(MultipleDeletionWizard): model = models.Find main_item_select_keys = ('selec-', 'selecw-') fields = ['label', 'material_types', 'datings', 'find_number', @@ -115,6 +117,7 @@ class FindDeletionWizard(DeletionWizard): 'preservation_to_considers', 'integrities', 'remarkabilities', 'volume', 'weight', 'length', 'width', 'height', 'diameter', 'comment'] + redirect_url = "find_deletion" class TreatmentSearch(SearchWizard): @@ -126,6 +129,7 @@ class TreatmentBase(Wizard): wizard_done_window = reverse_lazy('show-treatment') base_url = "" saved_args = {"treatment_type_list": []} + redirect_url = "treatment_search" def get_current_finds(self): step = self.steps.current @@ -189,13 +193,19 @@ class TreatmentWizard(TreatmentBase): dct = super(TreatmentWizard, self).get_extra_model(dct, m2m, form_list) if 'resulting_pk' in dct: dct['items'] = [] - pks = dct.pop('resulting_pk').split(u',') + pks = dct.pop('resulting_pk') + if not isinstance(pks, (list, tuple)): + pks = pks.split(u',') + for pk in pks: - try: - find = models.Find.objects.get(pk=pk) - dct['items'].append(find) - except models.Find.DoesNotExist: - raise PermissionDenied + if isinstance(pk, models.Find): + find = pk + else: + try: + find = models.Find.objects.get(pk=pk) + except models.Find.DoesNotExist: + raise PermissionDenied + dct['items'].append(find) if 'basket' in dct: basket = dct.pop('basket') if basket.user.pk != dct['history_modifier'].pk: @@ -316,11 +326,14 @@ class TreatmentN1Wizard(TreatmentBase): if hasattr(pks, 'split'): pks = pks.split(',') # string for pk in pks: - try: - find = models.Find.objects.get(pk=pk) - dct['upstream_items'].append(find) - except models.Find.DoesNotExist: - raise PermissionDenied + if isinstance(pk, models.Find): + find = pk + else: + try: + find = models.Find.objects.get(pk=pk) + except models.Find.DoesNotExist: + raise PermissionDenied + dct['upstream_items'].append(find) for find in dct['upstream_items']: if 'own' in self.current_right \ @@ -341,6 +354,8 @@ class Treatment1NWizard(TreatmentBase): saved_args = {"upstream_item": None, "resulting_finds": None, "treatment_type_list": []} base_url = 'treatment_creation_1n' + redirect_url = "find_modification" + open_created_in_redirect = False def get_form_kwargs(self, step, **kwargs): kwargs = super(Treatment1NWizard, self).get_form_kwargs(step, **kwargs) @@ -372,11 +387,14 @@ class Treatment1NWizard(TreatmentBase): # manage upstream item pk = dct.pop('resulting_pk') - try: - find = models.Find.objects.get(pk=pk) - dct['upstream_item'] = find - except models.Find.DoesNotExist: - raise PermissionDenied + if isinstance(pk, models.Find): + find = pk + else: + try: + find = models.Find.objects.get(pk=pk) + except models.Find.DoesNotExist: + raise PermissionDenied + dct['upstream_item'] = find if 'own' in self.current_right \ and not find.is_own(dct['history_modifier']): @@ -409,12 +427,14 @@ class TreatmentDeletionWizard(DeletionWizard): 'treatment_types', 'location', 'person', 'organization', 'external_id', 'comment', 'description', 'goal', 'start_date', 'end_date', 'container'] + redirect_url = "treatment_deletion" class TreatmentAdministrativeActWizard(OperationAdministrativeActWizard): model = models.Treatment current_obj_slug = 'administrativeacttreatment' ref_object_key = 'treatment' + redirect_url = "treatment_admacttreatment_modification" def get_reminder(self): return @@ -435,17 +455,19 @@ class TreatmentFileSearch(SearchWizard): class TreatmentFileWizard(Wizard): model = models.TreatmentFile wizard_done_window = reverse_lazy('show-treatmentfile') + redirect_url = "treatmentfile_modification" class TreatmentFileModificationWizard(TreatmentFileWizard): modification = True -class TreatmentFileDeletionWizard(DeletionWizard): +class TreatmentFileDeletionWizard(MultipleDeletionWizard): model = models.TreatmentFile fields = ['name', 'internal_reference', 'external_id', 'year', 'index', 'type', 'in_charge', 'reception_date', 'creation_date', 'end_date', 'comment'] + redirect_url = "treatmentfile_deletion" class TreatmentFileAdministrativeActWizard( @@ -453,6 +475,7 @@ class TreatmentFileAdministrativeActWizard( model = models.TreatmentFile current_obj_slug = 'administrativeacttreatmentfile' ref_object_key = 'treatment_file' + redirect_url = "treatmentfle_admacttreatmentfle_modification" def get_reminder(self): form_key = 'selec-' + self.url_name @@ -496,6 +519,7 @@ class FindBasketSearch(SearchWizard): class FindBasketWizard(Wizard): model = models.FindBasket wizard_done_window = reverse_lazy('show-findbasket') + redirect_url = "find_basket_modification" class FindBasketEditWizard(FindBasketWizard): @@ -514,4 +538,5 @@ class FindBasketEditWizard(FindBasketWizard): class FindBasketDeletionWizard(DeletionWizard): model = models.FindBasket + redirect_url = "find_basket_deletion" wizard_confirm = 'ishtar/wizard/wizard_findbasket_deletion.html' |