diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-07-08 00:01:50 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-07-08 00:01:50 +0200 |
| commit | 3349d76a08dd164a412ca8846e9a17ab05df82d6 (patch) | |
| tree | c9f996ff0c6556cfcf2a43a9854784ad4b0d838d /ishtar/ishtar_base/views.py | |
| parent | 2fc9a3feb4548e47a04c90f4ef76654d78a8396a (diff) | |
| download | Ishtar-3349d76a08dd164a412ca8846e9a17ab05df82d6.tar.bz2 Ishtar-3349d76a08dd164a412ca8846e9a17ab05df82d6.zip | |
Better packaging management (closes #515)
Diffstat (limited to 'ishtar/ishtar_base/views.py')
| -rw-r--r-- | ishtar/ishtar_base/views.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ishtar/ishtar_base/views.py b/ishtar/ishtar_base/views.py index d4d82ac9f..fcacc305a 100644 --- a/ishtar/ishtar_base/views.py +++ b/ishtar/ishtar_base/views.py @@ -508,6 +508,13 @@ get_itemsource = get_item(models.ItemSource, 'item__dating__period':'item__dating__period__pk', 'item__description':'item__description__icontains', }) +get_container = get_item(models.Container, + 'get_container', 'container', + extra_request_keys={ +'location':'location__pk', +'container_type':'container_type__pk', +'reference':'reference__icontains', + }) def autocomplete_warehouse(request): if not request.user.has_perm('ishtar_base.view_warehouse', models.Warehouse)\ @@ -588,7 +595,7 @@ def new_item(model): dct['new_item_pk'] = new_item.pk dct['parent_name'] = parent_name dct['parent_pk'] = parent_name - if '_select_' in dct['parent_pk']: + if dct['parent_pk'] and '_select_' in dct['parent_pk']: parents = dct['parent_pk'].split('_') dct['parent_pk'] = "_".join([parents[0]] + parents[2:]) return render_to_response('window.html', dct, |