diff --git a/ups_management/ups_manager/templates/ups_manager/ups_form.html b/ups_management/ups_manager/templates/ups_manager/ups_form.html index a81bb8f..d379d1d 100644 --- a/ups_management/ups_manager/templates/ups_manager/ups_form.html +++ b/ups_management/ups_manager/templates/ups_manager/ups_form.html @@ -91,7 +91,7 @@ id="{{ form.last_maintenance_date.id_for_label }}" name="{{ form.last_maintenance_date.name }}" class="form-control datepicker" - value="{{ form.last_maintenance_date.value|date:'Y-m-d' }}" + {% if form.last_maintenance_date.value %}value="{{ form.last_maintenance_date.value|date:'Y-m-d' }}"{% endif %} placeholder="选择日期"> {% if form.last_maintenance_date.errors %} {% for error in form.last_maintenance_date.errors %} diff --git a/ups_management/ups_manager/views.py b/ups_management/ups_manager/views.py index f764e97..793364b 100644 --- a/ups_management/ups_manager/views.py +++ b/ups_management/ups_manager/views.py @@ -121,14 +121,14 @@ class UPSHostUpdateView(UpdateView): context = self.get_context_data() battery_formset = context['battery_formset'] - if battery_formset.is_valid(): - self.object = form.save() + self.object = form.save() + + if battery_formset: battery_formset.instance = self.object battery_formset.save() - messages.success(self.request, 'UPS主机和电池信息已更新') - return redirect(self.success_url) - else: - return self.form_invalid(form) + + messages.success(self.request, 'UPS主机和电池信息已更新') + return redirect(self.success_url) class UPSHostDeleteView(DeleteView):