diff options
Diffstat (limited to 'ishtar/furnitures/forms.py')
| -rw-r--r-- | ishtar/furnitures/forms.py | 67 |
1 files changed, 36 insertions, 31 deletions
diff --git a/ishtar/furnitures/forms.py b/ishtar/furnitures/forms.py index b79142ea4..37d4d8af7 100644 --- a/ishtar/furnitures/forms.py +++ b/ishtar/furnitures/forms.py @@ -550,7 +550,12 @@ class Wizard(NamedUrlSessionFormWizard): request, storage) c_form = self.form_list[current_step] # make the current object the default item for the session - request.session[obj.__class__.__name__.lower()] = unicode(obj.pk) + obj_name = obj.__class__.__name__.lower() + # prefer a specialized name if available + prefixes = storage.prefix.split('_') + if len(prefixes) > 1 and prefixes[-2].startswith(obj_name): + obj_name = prefixes[-2] + request.session[obj_name] = unicode(obj.pk) initial = {} if hasattr(c_form, 'base_fields'): for base_field in c_form.base_fields.keys(): @@ -1289,7 +1294,7 @@ class AdministrativeActFileFormSelection(forms.Form): associated_models = {'pk':models.AdministrativeAct} currents = {'pk':models.AdministrativeAct} pk = forms.IntegerField(label="", required=False, - widget=widgets.JQueryJqGrid(reverse_lazy('get-administrativeact'), + widget=widgets.JQueryJqGrid(reverse_lazy('get-administrativeactfile'), AdministrativeActFileSelect(), models.AdministrativeAct, table_cols='TABLE_COLS_FILE'), validators=[models.valid_id(models.AdministrativeAct)]) @@ -1318,26 +1323,26 @@ class FinalAdministrativeActDeleteForm(FinalForm): confirm_msg = " " confirm_end_msg = _(u"Would you like to delete this administrative act?") -file_administrativeact_wizard = FileAdministrativeActWizard([ - ('selec-file_administrativeact', FileFormSelection), - ('administrativeact-file_administrativeact', AdministrativeActForm), - ('final-file_administrativeact', FinalForm)], - url_name='file_administrativeact',) +file_administrativeactfile_wizard = FileAdministrativeActWizard([ + ('selec-file_administrativeactfile', FileFormSelection), + ('administrativeact-file_administrativeactfile', AdministrativeActForm), + ('final-file_administrativeactfile', FinalForm)], + url_name='file_administrativeactfile',) -file_administrativeact_modification_wizard = FileEditAdministrativeActWizard([ - ('selec-file_administrativeact_modification', +file_administrativeactfile_modification_wizard = FileEditAdministrativeActWizard([ + ('selec-file_administrativeactfile_modification', AdministrativeActFileFormSelection), - ('administrativeact-file_administrativeact_modification', + ('administrativeact-file_administrativeactfile_modification', AdministrativeActForm), - ('final-file_administrativeact_modification', FinalForm)], - url_name='file_administrativeact_modification',) + ('final-file_administrativeactfile_modification', FinalForm)], + url_name='file_administrativeactfile_modification',) -file_administrativeact_deletion_wizard = AdministrativeActDeletionWizard([ - ('selec-file_administrativeact_deletion', +file_administrativeactfile_deletion_wizard = AdministrativeActDeletionWizard([ + ('selec-file_administrativeactfile_deletion', AdministrativeActFileFormSelection), - ('final-file_administrativeact_deletion', + ('final-file_administrativeactfile_deletion', FinalAdministrativeActDeleteForm)], - url_name='file_administrativeact_deletion',) + url_name='file_administrativeactfile_deletion',) class OperationWizard(FileWizard): model = models.Operation @@ -1748,7 +1753,7 @@ class AdministrativeActOpeSelect(forms.Form): class AdministrativeActOpeFormSelection(AdministrativeActFileFormSelection): pk = forms.IntegerField(label="", required=False, - widget=widgets.JQueryJqGrid(reverse_lazy('get-administrativeact'), + widget=widgets.JQueryJqGrid(reverse_lazy('get-administrativeactop'), AdministrativeActOpeSelect(), models.AdministrativeAct, table_cols='TABLE_COLS_OPE'), validators=[models.valid_id(models.AdministrativeAct)]) @@ -1758,27 +1763,27 @@ class AdministrativeActOpeForm(AdministrativeActForm): act_type = forms.ChoiceField(label=_("Act type"), choices=models.ActType.get_types(dct={'intented_to':'O'})) -operation_administrativeact_wizard = OperationAdministrativeActWizard([ - ('selec-operation_administrativeact', OperationFormSelection), - ('administrativeact-operation_administrativeact', AdministrativeActOpeForm), - ('final-operation_administrativeact', FinalForm)], - url_name='operation_administrativeact',) +operation_administrativeactop_wizard = OperationAdministrativeActWizard([ + ('selec-operation_administrativeactop', OperationFormSelection), + ('administrativeact-operation_administrativeactop', AdministrativeActOpeForm), + ('final-operation_administrativeactop', FinalForm)], + url_name='operation_administrativeactop',) -operation_administrativeact_modification_wizard = \ +operation_administrativeactop_modification_wizard = \ OperationEditAdministrativeActWizard([ - ('selec-operation_administrativeact_modification', + ('selec-operation_administrativeactop_modification', AdministrativeActOpeFormSelection), - ('administrativeact-operation_administrativeact_modification', + ('administrativeact-operation_administrativeactop_modification', AdministrativeActOpeForm), - ('final-operation_administrativeact_modification', FinalForm)], - url_name='operation_administrativeact_modification',) + ('final-operation_administrativeactop_modification', FinalForm)], + url_name='operation_administrativeactop_modification',) -operation_administrativeact_deletion_wizard = AdministrativeActDeletionWizard([ - ('selec-operation_administrativeact_deletion', +operation_administrativeactop_deletion_wizard = AdministrativeActDeletionWizard([ + ('selec-operation_administrativeactop_deletion', AdministrativeActOpeFormSelection), - ('final-operation_administrativeact_deletion', + ('final-operation_administrativeactop_deletion', FinalAdministrativeActDeleteForm)], - url_name='operation_administrativeact_deletion',) + url_name='operation_administrativeactop_deletion',) class RecordWizard(Wizard): model = models.Operation |