diff --git a/genericadmin/admin.py b/genericadmin/admin.py index e9f5fc4..5ee336c 100644 --- a/genericadmin/admin.py +++ b/genericadmin/admin.py @@ -63,7 +63,8 @@ def get_generic_field_list(self, request, prefix=''): fields['prefix'] = prefix field_list.append(fields) else: - for field in self.model._meta.virtual_fields: + # for field in self.model._meta.virtual_fields: + for field in self.model._meta.private_fields: if isinstance(field, GenericForeignKey) and \ field.ct_field not in exclude and field.fk_field not in exclude: field_list.append({ @@ -74,11 +75,10 @@ def get_generic_field_list(self, request, prefix=''): }) if hasattr(self, 'inlines') and len(self.inlines) > 0: - for FormSet, inline in zip(self.get_formsets(request), self.get_inline_instances(request)): + for FormSet, inline in self.get_formsets_with_inlines(request): if hasattr(inline, 'get_generic_field_list'): prefix = FormSet.get_default_prefix() field_list = field_list + inline.get_generic_field_list(request, prefix) - return field_list def get_urls(self): @@ -90,10 +90,12 @@ def wrapper(*args, **kwargs): custom_urls = [ url(r'^obj-data/$', wrap(self.generic_lookup), name='admin_genericadmin_obj_lookup'), url(r'^genericadmin-init/$', wrap(self.genericadmin_js_init), name='admin_genericadmin_init'), + url(r'^(\d+)/obj-data/$', wrap(self.generic_lookup), name='admin_genericadmin_obj_lookup_change'), + url(r'^(\d+)/genericadmin-init/change/$', wrap(self.genericadmin_js_init), name='admin_genericadmin_init_change'), ] return custom_urls + super(BaseGenericModelAdmin, self).get_urls() - def genericadmin_js_init(self, request): + def genericadmin_js_init(self, request, pk=None): if request.method == 'GET': obj_dict = {} for c in ContentType.objects.all(): @@ -115,10 +117,10 @@ def genericadmin_js_init(self, request): return HttpResponse(resp, content_type='application/json') return HttpResponseNotAllowed(['GET']) - def generic_lookup(self, request): + def generic_lookup(self, request, pk=None): if request.method != 'GET': return HttpResponseNotAllowed(['GET']) - + if 'content_type' in request.GET and 'object_id' in request.GET: content_type_id = request.GET['content_type'] object_id = request.GET['object_id'] diff --git a/genericadmin/static/genericadmin/js/genericadmin.js b/genericadmin/static/genericadmin/js/genericadmin.js index 529dbb9..072251a 100755 --- a/genericadmin/static/genericadmin/js/genericadmin.js +++ b/genericadmin/static/genericadmin/js/genericadmin.js @@ -73,7 +73,13 @@ }, getLookupUrl: function(cID) { - return '../../../' + this.url_array[cID][0] + '/' + this.getLookupUrlParams(cID); + var forword = '../../../'; + var suffix = '/change/'; + var href = window.location.href; + if (href.indexOf(suffix, href.length - suffix.length) !== -1) { + forword += '../'; + } + return forword + this.url_array[cID][0] + '/' + this.getLookupUrlParams(cID); }, getFkId: function() {