Implement proper mergeing of organisations

This commit is contained in:
Magnus Hagander
2011-08-18 10:46:25 +02:00
parent 26a72e1d4c
commit 248d940c7e
5 changed files with 75 additions and 2 deletions

View File

@ -110,6 +110,8 @@ urlpatterns = patterns('',
# Override some URLs in admin, to provide our own pages
(r'^admin/pending/$', 'pgweb.core.views.admin_pending'),
(r'^admin/purge/$', 'pgweb.core.views.admin_purge'),
(r'^admin/mergeorg/$', 'pgweb.core.views.admin_mergeorg'),
# Uncomment the next line to enable the admin:
(r'^admin/(.*)', admin.site.root),