summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--COPYRIGHT13
-rw-r--r--inventar/templates/item.html6
-rw-r--r--inventar/templates/search.html2
-rw-r--r--inventar/urls.py16
-rw-r--r--inventory/admin.py16
-rw-r--r--inventory/filters.py14
-rw-r--r--inventory/models.py14
l---------inventory/static/admin2
-rw-r--r--inventory/views.py14
9 files changed, 91 insertions, 6 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..9b39e48
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,13 @@
+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.
diff --git a/inventar/templates/item.html b/inventar/templates/item.html
index 28343e0..84a8fad 100644
--- a/inventar/templates/item.html
+++ b/inventar/templates/item.html
@@ -52,7 +52,7 @@
<td>
{% for p in parentpath %}
{% if p.one_barcode %}
- <ul class="path"><li><a href="{% url "item selectedid=p.one_barcode" %}">{{ p.name }} [{{ p.barcodes }}]</a>
+ <ul class="path"><li><a href="{% url "item" selectedid=p.one_barcode %}">{{ p.name }} [{{ p.barcodes }}]</a>
{% else %}
<ul class="path"><li>{{ p.name }} [{{ p.barcodes }}]
{% endif %}
@@ -69,7 +69,7 @@
<td>
{% for p in temporary_parentpath %}
{% if p.one_barcode %}
- <ul class="path"><li><a href="{% url "item selectedid=p.one_barcode" %}">{{ p.name }} [{{ p.barcodes }}]</a>
+ <ul class="path"><li><a href="{% url "item" selectedid=p.one_barcode %}">{{ p.name }} [{{ p.barcodes }}]</a>
{% else %}
<ul class="path"><li>{{ p.name }} [{{ p.barcodes }}]
{% endif %}
@@ -89,7 +89,7 @@
<ul>
{% for child in children %}
{% if child.one_barcode %}
- <li><a href="{% url item selectedid=child.one_barcode %}">{{ child.name }} [{{ child.barcodes }}]</a></li>
+ <li><a href="{% url "item" selectedid=child.one_barcode %}">{{ child.name }} [{{ child.barcodes }}]</a></li>
{% else %}
<li>{{ child.name }} [{{ child.barcodes }}]</li>
{% endif %}
diff --git a/inventar/templates/search.html b/inventar/templates/search.html
index 5a1f1cf..c5355d8 100644
--- a/inventar/templates/search.html
+++ b/inventar/templates/search.html
@@ -14,7 +14,7 @@
{% cycle 'row1' 'row2' as rowcolor silent %}
<tr class="{{ rowcolor }}">
{% if result.one_barcode %}
- <td><a href="{% url item selectedid=result.one_barcode %}">{{ result.name }}</a></td>
+ <td><a href="{% url "item" selectedid=result.one_barcode %}">{{ result.name }}</a></td>
{% else %}
<td>{{ result.name }}</td>
{% endif %}
diff --git a/inventar/urls.py b/inventar/urls.py
index ffb1757..370b283 100644
--- a/inventar/urls.py
+++ b/inventar/urls.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.conf.urls import patterns, include, url
from django.conf.urls.static import static
from django.conf import settings
@@ -16,7 +30,7 @@ urlpatterns = patterns('',
url(r'^$', home, name='home'),
#(r'^openid/', include('django_openid_auth.urls')),
- url(r'^item/(?P<selectedid>[0-9A-Za-z]{4})/$', item, name='item'),
+ url(r'^item/(?P<selectedid>[0-9A-Za-z]{4,6})/$', item, name='item'),
url(r'^search/(?P<term>[^/]+)/$', search, name='search'),
url(r'^graph/$', graph, name='graph'),
url(r'^stats/$', stats, name='stats'),
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 29c8a32..82aab79 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 11:08:16 +0000