From 96eabed66b6810e59c19a9df0d5efdfcb9c2a4ec Mon Sep 17 00:00:00 2001 From: erichhasl Date: Fri, 21 Oct 2016 22:56:21 +0200 Subject: [PATCH] remove manual formatting --- jdav_web/material/admin.py | 4 +--- jdav_web/material/models.py | 18 +----------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/jdav_web/material/admin.py b/jdav_web/material/admin.py index 4c5909f..782b960 100644 --- a/jdav_web/material/admin.py +++ b/jdav_web/material/admin.py @@ -1,7 +1,6 @@ from django.contrib import admin -from django import forms -from .models import MaterialPart, MaterialPartForm, Ownership +from .models import MaterialPart, Ownership # Register your models here. @@ -17,7 +16,6 @@ class OwnershipInline(admin.StackedInline): class MaterialAdmin(admin.ModelAdmin): """Edit view of a MaterialPart""" - form = MaterialPartForm list_display = ('name', 'buy_date', 'lifetime', 'not_too_old', 'photo') inlines = [OwnershipInline] diff --git a/jdav_web/material/models.py b/jdav_web/material/models.py index 5ad4e5e..1c8cfa2 100644 --- a/jdav_web/material/models.py +++ b/jdav_web/material/models.py @@ -1,9 +1,6 @@ from datetime import datetime -from decimal import Decimal from django.db import models -from django.contrib.admin import widgets -from django import forms from django.utils import timezone # maximum time in years of a material part until being replaced @@ -19,7 +16,7 @@ class MaterialPart(models.Model): name = models.CharField(max_length=30) buy_date = models.DateField('purchase date', editable=True) lifetime = models.DecimalField('lifetime (years)', decimal_places=0, - max_digits=3) + max_digits=3) photo = models.ImageField('photo', upload_to='images', blank=True) def __str__(self): @@ -36,19 +33,6 @@ class MaterialPart(models.Model): not_too_old.boolean = True not_too_old.short_description = 'Not too old?' -class MaterialPartForm(forms.ModelForm): - """ - An input form for the `MaterialPart` model. - - This additional class is needed to override djangos default - `models.DateField` date format with a european format. - """ - buy_date = forms.DateField(widget=widgets.AdminDateWidget, input_formats=('%d.%m.%Y',)) - - class Meta: - model = MaterialPart - exclude = [] - class Ownership(models.Model): """Represents the connection between a MaterialPart and a Member"""