diff --git a/abonapp/forms.py b/abonapp/forms.py index dbadb65..6f26e20 100644 --- a/abonapp/forms.py +++ b/abonapp/forms.py @@ -36,14 +36,17 @@ def generate_random_password(): class AbonForm(forms.ModelForm): def __init__(self, *args, **kwargs): super(AbonForm, self).__init__(*args, **kwargs) - if self.instance is not None and self.instance.group is not None: - abon_group_queryset = models.AbonStreet.objects.filter(group=self.instance.group) + instance = getattr(self, 'instance') + if instance is not None and instance.group is not None: + abon_group_queryset = models.AbonStreet.objects.filter(group=instance.group) elif 'group' in self.initial.keys() and self.initial['group'] is not None: abon_group_queryset = models.AbonStreet.objects.filter(group=self.initial['group']) else: abon_group_queryset = None if abon_group_queryset is not None: self.fields['street'].queryset = abon_group_queryset + if instance is not None and instance.is_dynamic_ip: + self.fields['ip_address'].widget.attrs['readonly'] = True username = forms.CharField(max_length=127, required=False, initial=generate_random_username, widget=forms.TextInput(attrs={ diff --git a/abonapp/templates/abonapp/editAbon.html b/abonapp/templates/abonapp/editAbon.html index 1524d4c..993f6de 100644 --- a/abonapp/templates/abonapp/editAbon.html +++ b/abonapp/templates/abonapp/editAbon.html @@ -10,7 +10,12 @@
| {% trans 'User group' %} | -- {{ abon.group|default:_('Not assigned') }} - | -
| {% trans 'Is active' %} | -- {{ abon.is_active|yesno:_('yes,no') }} - | -
| {% trans 'login' %} | -{{ abon.username|default:_('Not assigned') }} | -
| {% trans 'fio' %} | -{{ abon.fio|default:_('Not assigned') }} | -
| {% trans 'Telephone' %} | -{{ abon.telephone|default:_('Not assigned') }} | -
| {% trans 'Street' %} | -- {{ abon.street|default:_('Not assigned') }} - | -
| {% trans 'House' %} | -{{ abon.house|default:_('Not assigned') }} | -
| {% trans 'Ip Address' %} | -{{ abon.ip_address|default:_('Not assigned') }} | -
| {% trans 'Password' %} | -{{ passw }} | -
{{ abon.description }}
{% endif %} -