Make organisations support multiple "managers" and not just one

"submitter", thus making it possible for a single person to manage
multiple organisations, as well as for a single organisation to have
multiple different manages.

Re-hook events and news items to use organisation of the submitter
instead of the user who did the submission. (product listings already
did this)

pgweb/account/views.py

@@ -15,10 +15,10 @@ from pgweb.downloads.models import Product
 @ssl_required
 @login_required
 def home(request):
-	myarticles = NewsArticle.objects.filter(submitter=request.user)
-	myevents = Event.objects.filter(submitter=request.user)
-	myorgs = Organisation.objects.filter(submitter=request.user)
-	myproducts = Product.objects.filter(publisher__submitter=request.user)
+	myarticles = NewsArticle.objects.filter(org__managers=request.user)
+	myevents = Event.objects.filter(org__managers=request.user)
+	myorgs = Organisation.objects.filter(managers=request.user)
+	myproducts = Product.objects.filter(publisher__managers=request.user)
 	return render_to_response('account/index.html', {
 		'newsarticles': myarticles,
 		'events': myevents,

pgweb/core/admin.py

@@ -9,7 +9,8 @@ class OrganisationAdmin(admin.ModelAdmin):
 	list_display = ('name', 'approved', 'lastconfirmed',)
 	list_filter = ('approved',)
 	ordering = ('name', )
-
+	filter_horizontal = ('managers', )
+	search_fields = ('name', )
 
 admin.site.register(Version)
 admin.site.register(OrganisationType)

pgweb/core/forms.py

@@ -5,5 +5,5 @@ from models import Organisation
 class OrganisationForm(forms.ModelForm):
 	class Meta:
 		model = Organisation
-		exclude = ('lastconfirmed', 'approved', 'submitter', )
+		exclude = ('lastconfirmed', 'approved', 'managers', )
 

pgweb/core/models.py

@@ -44,7 +44,7 @@ class Organisation(PgModel, models.Model):
 	email = models.EmailField(null=False, blank=True)
 	phone = models.CharField(max_length=100, null=False, blank=True)
 	orgtype = models.ForeignKey(OrganisationType, null=False, blank=False)
-	submitter = models.ForeignKey(User, null=False, blank=False)
+	managers = models.ManyToManyField(User, null=False, blank=False)
 	lastconfirmed = models.DateTimeField(null=False, blank=False, default=datetime.now())
 
 	send_notification = True

pgweb/downloads/forms.py

@@ -9,8 +9,7 @@ If you have not done so, use <a href="/account/organisations/new/">this form</a>
 	def __init__(self, *args, **kwargs):
 		super(ProductForm, self).__init__(*args, **kwargs)
 	def filter_by_user(self, user):
-		print "Filter to user %s" % user
-		self.fields['publisher'].queryset = Organisation.objects.filter(submitter=user)
+		self.fields['publisher'].queryset = Organisation.objects.filter(managers=user, approved=True)
 	class Meta:
 		model = Product
 		exclude = ('lastconfirmed', 'approved', )

pgweb/downloads/models.py

@@ -87,7 +87,7 @@ class Product(PgModel, models.Model):
 		return self.name
 
 	def verify_submitter(self, user):
-		return (user == self.publisher.submitter)
+		return (len(self.publisher.managers.filter(pk=user.pk)) == 1)
 
 	class Meta:
 		ordering = ('name',)

pgweb/events/forms.py

@@ -7,7 +7,7 @@ class EventForm(forms.ModelForm):
 	def __init__(self, *args, **kwargs):
 		super(EventForm, self).__init__(*args, **kwargs)
 	def filter_by_user(self, user):
-		self.fields['org'].queryset = Organisation.objects.filter(submitter=user)
+		self.fields['org'].queryset = Organisation.objects.filter(managers=user, approved=True)
 	class Meta:
 		model = Event
 		exclude = ('submitter', 'approved', )

pgweb/events/models.py

@@ -6,7 +6,6 @@ from pgweb.util.bases import PgModel
 from core.models import Country, Organisation
 
 class Event(models.Model, PgModel):
-	submitter = models.ForeignKey(User, null=False, blank=False)
 	approved = models.BooleanField(null=False, blank=False, default=False)
 
 	org = models.ForeignKey(Organisation, null=False, blank=False)
@@ -28,11 +27,18 @@ class Event(models.Model, PgModel):
 	def __unicode__(self):
 		return "%s: %s" % (self.startdate, self.title)
 
+	def verify_submitter(self, user):
+		return (len(self.org.managers.filter(pk=user.pk)) == 1)
+
 	@property
-	def has_submitter(self):
-		# If submitter is 0 it means migrated, so have no submitter
-		if self.submitter_id == 0: return False
-		return True
+	def has_organisation(self):
+		mgrs = self.org.managers.all()
+		if len(mgrs) == 1:
+			if mgrs[0].pk == 0:
+				return False # Migration organisation
+			else:
+				return True # Has an actual organisation
+		return False # Has no organisastion at all
 
 	@property
 	def displaydate(self):

pgweb/news/forms.py

@@ -1,8 +1,13 @@
 from django import forms
 
+from pgweb.core.models import Organisation
 from models import NewsArticle
 
 class NewsArticleForm(forms.ModelForm):
+	def __init__(self, *args, **kwargs):
+		super(NewsArticleForm, self).__init__(*args, **kwargs)
+	def filter_by_user(self, user):
+		self.fields['org'].queryset = Organisation.objects.filter(managers=user, approved=True)
 	class Meta:
 		model = NewsArticle
 		exclude = ('submitter', 'approved', )

pgweb/news/models.py

@@ -1,10 +1,10 @@
 from django.db import models
-from django.contrib.auth.models import User
 from datetime import date
+from pgweb.core.models import Organisation
 from pgweb.util.bases import PgModel
 
 class NewsArticle(PgModel, models.Model):
-	submitter = models.ForeignKey(User, null=False, blank=False)
+	org = models.ForeignKey(Organisation, null=False, blank=False)
 	approved = models.BooleanField(null=False, blank=False, default=False)
 	date = models.DateField(null=False, blank=False, default=date.today)
 	title = models.CharField(max_length=200, null=False, blank=False)
@@ -16,5 +16,8 @@ class NewsArticle(PgModel, models.Model):
 	def __unicode__(self):
 		return "%s: %s" % (self.date, self.title)
 	
+	def verify_submitter(self, user):
+		return (len(self.org.managers.filter(pk=user.pk)) == 1)
+
 	class Meta:
 		ordering = ('-date',)

templates/events/item.html

@@ -7,8 +7,8 @@
 <p>
 {{obj.details|markdown:"safe"}}
 </p>
-{%if obj.has_submitter%}
-<p>Posted by {{obj.submitter.email}}.</p>
+{%if obj.has_organisation%}
+<p>Posted by {{obj.org}}{%if obj.org.email%} ({{obj.org.email}}){%endif%}.</p>
 {%else%}
 <p><i>This event has been migrated from a previous version of the PostgreSQL
 website. We apologise for any formatting issues caused by the migration.</i></p>