diff options
Diffstat (limited to 'inventory')
| -rw-r--r-- | inventory/admin.py | 16 | ||||
| -rw-r--r-- | inventory/filters.py | 14 | ||||
| -rw-r--r-- | inventory/models.py | 14 | ||||
| l--------- | inventory/static/admin | 2 | ||||
| -rw-r--r-- | inventory/views.py | 14 |
5 files changed, 59 insertions, 1 deletions
diff --git a/inventory/admin.py b/inventory/admin.py index 37eceaf..838c1b1 100644 --- a/inventory/admin.py +++ b/inventory/admin.py @@ -1,3 +1,17 @@ +# Copyright (c) 2012-2013 Sebastian Reichel <sre@ring0.de> +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + from django.utils.translation import ugettext_lazy as _ from django.contrib import admin from django.forms.widgets import Select @@ -20,6 +34,8 @@ class ItemAdmin(admin.ModelAdmin): filters.HasBarcode, 'decommissioned', 'tag', + 'permanentLoan', + 'owner', ) list_display = ('name','category','inUse','parent','barcodes') ordering = ['-id',] diff --git a/inventory/filters.py b/inventory/filters.py index 74a35dd..4449451 100644 --- a/inventory/filters.py +++ b/inventory/filters.py @@ -1,3 +1,17 @@ +# Copyright (c) 2012-2013 Sebastian Reichel <sre@ring0.de> +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + from django.utils.translation import ugettext_lazy as _ from django.contrib.admin import SimpleListFilter import models diff --git a/inventory/models.py b/inventory/models.py index 6dfd7f6..3e21cf7 100644 --- a/inventory/models.py +++ b/inventory/models.py @@ -1,3 +1,17 @@ +# Copyright (c) 2012-2013 Sebastian Reichel <sre@ring0.de> +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + from django.utils.translation import ugettext_lazy as _ from django.db import models diff --git a/inventory/static/admin b/inventory/static/admin index 776e936..9d8ffb6 120000 --- a/inventory/static/admin +++ b/inventory/static/admin @@ -1 +1 @@ -/usr/share/pyshared/django/contrib/admin/static/admin
\ No newline at end of file +/usr/lib/python2.7/dist-packages/django/contrib/admin/static/admin
\ No newline at end of file diff --git a/inventory/views.py b/inventory/views.py index 382da5f..2b42f0c 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -1,3 +1,17 @@ +# Copyright (c) 2012-2013 Sebastian Reichel <sre@ring0.de> +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + from django.shortcuts import get_object_or_404 from django.utils.translation import ugettext_lazy as _ from django.shortcuts import render_to_response |