mango r252 - in branches/django: . mango

[ovitters svn gnome org]

Author: ovitters
Date: Tue Jun 24 21:27:23 2008
New Revision: 252
URL: http://svn.gnome.org/viewvc/mango?rev=252&view=rev

Log:
	* mango/views.py (get_xmldoc, list_users, edit_user, view_index,
	  list_accounts, add_account, list_mirrors, edit_mirror, add_mirror,
	  list_foundationmembers, edit_foundationmember, list_modules): Adding
	  a subpagenode is so common, add the functionality to get_xmldoc.


Modified:
   branches/django/   (props changed)
   branches/django/ChangeLog
   branches/django/mango/views.py

Modified: branches/django/mango/views.py
==============================================================================
--- branches/django/mango/views.py	(original)
+++ branches/django/mango/views.py	Tue Jun 24 21:27:23 2008
@@ -15,7 +15,7 @@
     import cElementTree as ET
 
 
-def get_xmldoc(title, request):
+def get_xmldoc(title, request, subpage=None):
     pagenode = ET.Element('page', {
         'title': title,
         'mode': settings.MANGO_CFG['mode'],
@@ -40,6 +40,8 @@
         for group in user.groups:
             node = ET.SubElement(pagenode, 'group', {'cn': group.cn})
 
+    if subpage is not None:
+        pagenode = ET.SubElement(page, subpage)
     return doc, pagenode
 
 def get_xmlresponse(doc, template, response=None):
@@ -80,8 +82,7 @@
 
 
 def list_users(request):
-    doc, root = get_xmldoc('List Users', request)
-    pagenode = ET.SubElement(root, 'listusers')
+    doc, pagenode = get_xmldoc('List Users', request, 'listusers')
 
     l = models.LdapUtil().handle
     if not l:
@@ -110,8 +111,7 @@
     return get_xmlresponse(doc, "list_users.xsl")
 
 def edit_user(request, user):
-    doc, root = get_xmldoc('Update user %s' % user, request)
-    pagenode = ET.SubElement(root, 'updateuser')
+    doc, pagenode = get_xmldoc('Update user %s' % user, request, 'updateuser')
 
     l = models.LdapUtil().handle
     if not l:
@@ -143,14 +143,12 @@
 
 
 def view_index(request):
-    doc, root = get_xmldoc('Login Page', request)
-    root.append(ET.Element('homepage'))
+    doc, pagenode = get_xmldoc('Login Page', request, 'homepage')
 
     return get_xmlresponse(doc, "index.xsl")
 
 def list_accounts(request):
-    doc, root = get_xmldoc('List Accounts', request)
-    pagenode = ET.SubElement(root, 'listaccounts')
+    doc, pagenode = get_xmldoc('List Accounts', request, 'listaccounts')
 
     queryset = models.AccountRequest.objects.filter(status='S')
     paginator = QuerySetPaginator(queryset, 25)
@@ -173,8 +171,7 @@
     return get_xmlresponse(doc, "list_accounts.xsl")
 
 def add_account(request):
-    doc, root = get_xmldoc('Request LDAP account', request)
-    pagenode = ET.SubElement(root, 'newaccount')
+    doc, pagenode = get_xmldoc('Request LDAP account', request, 'newaccount')
 
     dev_modules = models.DevModules.search()
     trans_modules = models.L10nModules.search()
@@ -193,8 +190,7 @@
     return get_xmlresponse(doc, "new_account.xsl")
 
 def list_mirrors(request):
-    doc, root = get_xmldoc('List Mirrors', request)
-    pagenode = ET.SubElement(root, 'listftpmirrors')
+    doc, pagenode = get_xmldoc('List Mirrors', request, 'listftpmirrors')
 
     filter = request.GET.get('filter_keyword', None)
     if filter:
@@ -221,8 +217,7 @@
 
 
 def edit_mirror(request, pk):
-    doc, root = get_xmldoc('Update mirror', request)
-    pagenode = ET.SubElement(root, 'updateftpmirror')
+    doc, pagenode = get_xmldoc('Update mirror', request, 'updateftpmirror')
 
     mirror = get_object_or_404(models.Ftpmirrors.objects, pk=pk)
 
@@ -236,8 +231,7 @@
     return get_xmlresponse(doc, "update_ftpmirror.xsl")
 
 def add_mirror(request):
-    doc, root = get_xmldoc('New mirror', request)
-    pagenode = ET.SubElement(root, 'newftpmirror')
+    doc, pagenode = get_xmldoc('New mirror', request, 'newftpmirror')
 
     if request.method == 'POST':
         f = models.FtpmirrorsForm(request.POST)
@@ -267,8 +261,7 @@
         ET.SubElement(root, 'need_to_renew')
 
 def list_foundationmembers(request):
-    doc, root = get_xmldoc('List Foundation Members', request)
-    pagenode = ET.SubElement(root, 'listfoundationmembers')
+    doc, pagenode = get_xmldoc('List Foundation Members', request, 'listfoundationmembers')
 
     members = models.Foundationmembers.objects.all()
     paginator = QuerySetPaginator(members, 25)
@@ -285,7 +278,7 @@
     return get_xmlresponse(doc, "list_foundationmembers.xsl")
 
 def edit_foundationmember(request, pk):
-    doc, root = get_xmldoc('Update Foundation Member', request)
+    doc, pagenode = get_xmldoc('Update Foundation Member', request)
     pagenode = ET.SubElement(root, 'updatefoundationmember')
 
     obj = get_object_or_404(models.Foundationmembers.objects, pk=pk)
@@ -300,8 +293,7 @@
     return get_xmlresponse(doc, "update_foundationmember.xsl")
 
 def list_modules(request):
-    doc, root = get_xmldoc('List Modules', request)
-    pagenode = ET.SubElement(root, 'listmodules')
+    doc, pagenode = get_xmldoc('List Modules', request, 'listmodules')
 
     queryset = models.Modules.search()