X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/bce7b7c4d0308a1d9a2e450b83ba1dac99e57d5b..d8ba4e197c35a8e30f10112fcf53740e0711dc98:/admin/base.py?ds=sidebyside

diff --git a/admin/base.py b/admin/base.py
index cb814b7..0413dde 100644
--- a/admin/base.py
+++ b/admin/base.py
@@ -1,8 +1,12 @@
 from django.conf import settings
 from django.contrib import admin
 from django.contrib.contenttypes import generic
+from django.http import HttpResponse
+from django.utils import simplejson as json
+from django.utils.html import escape
 from philo.models import Tag, Attribute
 from philo.forms import AttributeForm, AttributeInlineFormSet
+from philo.admin.widgets import TagFilteredSelectMultiple
 
 
 COLLAPSE_CLASSES = ('collapse', 'collapse-closed', 'closed',)
@@ -33,5 +37,31 @@ class TagAdmin(admin.ModelAdmin):
 	list_display = ('name', 'slug')
 	prepopulated_fields = {"slug": ("name",)}
 	search_fields = ["name"]
+	
+	def response_add(self, request, obj, post_url_continue='../%s/'):
+		# If it's an ajax request, return a json response containing the necessary information.
+		if request.is_ajax():
+			return HttpResponse(json.dumps({'pk': escape(obj._get_pk_val()), 'unicode': escape(obj)}))
+		return super(TagAdmin, self).response_add(request, obj, post_url_continue)
+
+
+class AddTagAdmin(admin.ModelAdmin):
+	def formfield_for_manytomany(self, db_field, request=None, **kwargs):
+		"""
+		Get a form Field for a ManyToManyField.
+		"""
+		# If it uses an intermediary model that isn't auto created, don't show
+		# a field in admin.
+		if not db_field.rel.through._meta.auto_created:
+			return None
+		
+		if db_field.rel.to == Tag and db_field.name in (list(self.filter_vertical) + list(self.filter_horizontal)):
+			opts = Tag._meta
+			if request.user.has_perm(opts.app_label + '.' + opts.get_add_permission()):
+				kwargs['widget'] = TagFilteredSelectMultiple(db_field.verbose_name, (db_field.name in self.filter_vertical))
+				return db_field.formfield(**kwargs)
+		
+		return super(AddTagAdmin, self).formfield_for_manytomany(db_field, request, **kwargs)
+
 
 admin.site.register(Tag, TagAdmin)
\ No newline at end of file