From ddb0a391527f522d239388a5a8ccc236fef3ae8f Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Mon, 7 Nov 2011 22:17:07 +0100
Subject: [PATCH] Add more information about to do with existing organisations

This includes explaining what "Migrated Connection" actually means
when listed as a manager.
---
 pgweb/account/views.py            | 2 ++
 templates/account/objectlist.html | 3 +++
 templates/account/orglist.html    | 9 ++++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/pgweb/account/views.py b/pgweb/account/views.py
index d4b83d99..cb089b1a 100644
--- a/pgweb/account/views.py
+++ b/pgweb/account/views.py
@@ -56,6 +56,7 @@ objtypes = {
 	'organisations': {
 		'title': 'Organisation',
 		'objects': lambda u: Organisation.objects.filter(managers=u),
+		'submit_header': 'Before submitting a new Organisation, please verify on the list of <a href="/account/orglist">current organisations</a> if the organisation already exists. If it does, please contact the manager of the organisation to gain permissions.',
 	},
 }
 
@@ -69,6 +70,7 @@ def listobjects(request, objtype):
 	return render_to_response('account/objectlist.html', {
 	    'objects': o['objects'](request.user),
 		'title': o['title'],
+		'submit_header': o.has_key('submit_header') and o['submit_header'] or None,
 		'suburl': objtype,
 	}, NavContext(request, 'account'))
 
diff --git a/templates/account/objectlist.html b/templates/account/objectlist.html
index 2d7bdbec..ae45cbf1 100644
--- a/templates/account/objectlist.html
+++ b/templates/account/objectlist.html
@@ -13,6 +13,9 @@ extensive.
 {%endfor%}
 </ul>
 
+{%if submit_header%}
+<p>{{submit_header|safe}}</p>
+{%endif%}
 <p>
 <a href="/account/{{suburl}}/new/">Submit {{title}}</a>
 </p>
diff --git a/templates/account/orglist.html b/templates/account/orglist.html
index 5ff750a0..e7d1ff61 100644
--- a/templates/account/orglist.html
+++ b/templates/account/orglist.html
@@ -3,7 +3,14 @@
 {%block contents%}
 <h1>Organisations</h1>
 <p>
-The following organisations are registered in our database:
+The following organisations are registered in our database. Note that any
+organisations listed as <i>Migrated Connections</i> are organisations that
+have been migrated from our old website and not been given a proper
+manager in the new system. If you are the manager of one of these
+organisations, please send an email to
+<a href="mailto:webmaster@postgresql.org">webmaster@postgresql.org</a>
+letting us know this, and including the name of your community account.
+We will then link your account to this organisation.
 </p>
 <table>
  <tr>
-- 
2.39.5