diff options
| author | Sebastian Reichel <sre@ring0.de> | 2015-03-25 21:11:20 +0100 |
|---|---|---|
| committer | Sebastian Reichel <sre@ring0.de> | 2015-03-25 21:11:20 +0100 |
| commit | 436593504095bea694696da7c5837d2712036b1a (patch) | |
| tree | a8a35842906444fab2f6ecf392488ae458839e3a | |
| parent | 79fc0fb8ca2216eeb863590723185eb3cbff7409 (diff) | |
| download | ktt-inventory-system-436593504095bea694696da7c5837d2712036b1a.tar.bz2 | |
update for django 1.7
| -rw-r--r-- | inventar/templates/base.html | 6 | ||||
| -rw-r--r-- | inventory/admin.py | 3 | ||||
| -rw-r--r-- | inventory/models.py | 12 |
3 files changed, 11 insertions, 10 deletions
diff --git a/inventar/templates/base.html b/inventar/templates/base.html index d72414a..a97ed7e 100644 --- a/inventar/templates/base.html +++ b/inventar/templates/base.html @@ -13,9 +13,9 @@ <div class="body"> <div class="menu"> <ul> - <li><a href="{% url home %}"><img src="/static/home.svg" width="24" height="24" /> {% trans "Home" %}</a></li> - <li><a href="{% url admin:index %}"><img src="/static/admin.svg" width="24" height="24" /> {% trans "Admin Area" %}</a></li> - <li><a href="{% url stats %}"><img src="/static/stats.svg" width="24" height="24" /> {% trans "Statistics" %}</a></li> + <li><a href="{% url "home" %}"><img src="/static/home.svg" width="24" height="24" /> {% trans "Home" %}</a></li> + <li><a href="{% url "admin:index" %}"><img src="/static/admin.svg" width="24" height="24" /> {% trans "Admin Area" %}</a></li> + <li><a href="{% url "stats" %}"><img src="/static/stats.svg" width="24" height="24" /> {% trans "Statistics" %}</a></li> <li><br></li> <li>{% trans "Search Item" %}: <ul> diff --git a/inventory/admin.py b/inventory/admin.py index 3749578..37eceaf 100644 --- a/inventory/admin.py +++ b/inventory/admin.py @@ -40,7 +40,8 @@ class BarcodeAdmin(admin.ModelAdmin): search_fields = ['code',] class EliminationAdmin(admin.ModelAdmin): - filter_vertical = ('item',) + #filter_vertical = ('item',) + pass admin.site.register(models.Item, ItemAdmin) admin.site.register(models.Owner) diff --git a/inventory/models.py b/inventory/models.py index 1d8cd67..6dfd7f6 100644 --- a/inventory/models.py +++ b/inventory/models.py @@ -60,22 +60,22 @@ class Item(models.Model): description = models.TextField(blank=True, verbose_name=_('description')) business_area = models.ForeignKey(BusinessArea, verbose_name=_('business area')) category = models.ForeignKey(Category, verbose_name=_('category')) - decommissioned = models.BooleanField(verbose_name=_('decommissioned')) + decommissioned = models.BooleanField(verbose_name=_('decommissioned'),default=False) targetQuantity = models.IntegerField(blank=True, null=True, verbose_name=_('target quantity')) - depreciation = models.BooleanField(verbose_name=_('deprecation')) + depreciation = models.BooleanField(verbose_name=_('deprecation'),default=False) datasheet = models.FileField(upload_to="datasheets/", blank=True, null=True, verbose_name=_('datasheet')) parent = models.ForeignKey('self', blank=True, null=True, on_delete=models.SET_NULL, verbose_name=_('parent'), related_name='item_parents') temp_parent = models.ForeignKey('self', blank=True, null=True, on_delete=models.SET_NULL, verbose_name=_('temporal parent'), related_name='item_temp_parents') - inUse = models.BooleanField(verbose_name=_('in use')) + inUse = models.BooleanField(verbose_name=_('in use'),default=False) supplier = models.TextField(blank=True, verbose_name=_('supplier')) note = models.TextField(blank=True, verbose_name=_('note')) ean = models.IntegerField(blank=True, null=True, verbose_name=_('EAN')) - premium = models.BooleanField(verbose_name=_('premium')) - unlabeled = models.BooleanField(verbose_name=_('unlabeled')) + premium = models.BooleanField(verbose_name=_('premium'),default=False) + unlabeled = models.BooleanField(verbose_name=_('unlabeled'),default=False) image = models.ImageField(upload_to="images/", blank=True, null=True, verbose_name=_('image')) contact = models.TextField(blank=True, verbose_name=_('contact')) tag = models.ManyToManyField(Tag, verbose_name=_('tags')) - permanentLoan = models.BooleanField(verbose_name=_('permanent loan')) + permanentLoan = models.BooleanField(verbose_name=_('permanent loan'),default=False) owner = models.ForeignKey(Owner, blank=True, null=True, on_delete=models.SET_NULL, verbose_name=_('owner')) def barcodes(self): |