mango r251 - in branches/django: . mango

[ovitters svn gnome org]

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

Log:
	* mango/views.py (edit_user, add_account, list_mirrors, edit_mirror,
	  add_mirror): Name the variables more consistently.


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:21 2008
@@ -111,7 +111,7 @@
 
 def edit_user(request, user):
     doc, root = get_xmldoc('Update user %s' % user, request)
-    el = ET.SubElement(root, 'updateuser')
+    pagenode = ET.SubElement(root, 'updateuser')
 
     l = models.LdapUtil().handle
     if not l:
@@ -125,18 +125,18 @@
     user = users[0]
 
     for item in ('uid', 'cn', 'mail', 'description'):
-        node = ET.SubElement(el, item)
+        node = ET.SubElement(pagenode, item)
         node.text = user.__dict__.get(item, '')
 
     for key in user.__dict__.get('authorizedKey', []):
         # TODO:
         #  - add fingerprint of above keys
         if key:
-            node = ET.SubElement(el, 'authorizedKey')
+            node = ET.SubElement(pagenode, 'authorizedKey')
             node.text = key
 
     for group in user.groups:
-        node = ET.SubElement(el, 'group', {'cn': group.cn})
+        node = ET.SubElement(pagenode, 'group', {'cn': group.cn})
 
     return get_xmlresponse(doc, "update_user.xsl")
 
@@ -174,19 +174,19 @@
 
 def add_account(request):
     doc, root = get_xmldoc('Request LDAP account', request)
-    form = ET.SubElement(root, 'newaccount')
+    pagenode = ET.SubElement(root, 'newaccount')
 
     dev_modules = models.DevModules.search()
     trans_modules = models.L10nModules.search()
 
     for module in dev_modules:
-        ET.SubElement(form, 'gnomemodule', {'cn': module.cn})
+        ET.SubElement(pagenode, 'gnomemodule', {'cn': module.cn})
     for module in trans_modules:
-        ET.SubElement(form, 'translation', {'cn': module.cn, 'desc': module.description})
+        ET.SubElement(pagenode, 'translation', {'cn': module.cn, 'desc': module.description})
 
     if request.method == 'POST':
         f = models.AccountsForm(request.POST)
-        if add_form_errors_to_xml(el, f):
+        if add_form_errors_to_xml(pagenode, f):
 #            mirror = f.save()
             return HttpResponseRedirect(u'../view/%s' % unicode(mirror.id))
 
@@ -194,13 +194,13 @@
 
 def list_mirrors(request):
     doc, root = get_xmldoc('List Mirrors', request)
-    ftpnodes = ET.SubElement(root, 'listftpmirrors')
+    pagenode = ET.SubElement(root, 'listftpmirrors')
 
     filter = request.GET.get('filter_keyword', None)
     if filter:
         queryset = models.Ftpmirrors.objects.filter(Q(name__contains=filter) | Q(url__contains=filter))
 
-        filternode = ET.SubElement(ftpnodes, 'filter')
+        filternode = ET.SubElement(pagenode, 'filter')
         keynode = ET.SubElement(filternode, 'keyword')
         keynode.text = filter
     else:
@@ -211,9 +211,9 @@
         page = paginator.page(request.GET.get('page', 1))
     except InvalidPage:
         raise Http404('Invalid page')
-    add_paginator_to_xml(ftpnodes, page)
+    add_paginator_to_xml(pagenode, page)
     for obj in page.object_list:
-        ftpnode = ET.SubElement(ftpnodes, 'ftpmirror')
+        ftpnode = ET.SubElement(pagenode, 'ftpmirror')
 
         obj.add_to_xml(ET, ftpnode)
 
@@ -222,13 +222,13 @@
 
 def edit_mirror(request, pk):
     doc, root = get_xmldoc('Update mirror', request)
-    el = ET.SubElement(root, 'updateftpmirror')
+    pagenode = ET.SubElement(root, 'updateftpmirror')
 
     mirror = get_object_or_404(models.Ftpmirrors.objects, pk=pk)
 
     if request.method == 'POST':
         f = models.FtpmirrorsForm(request.POST, instance=mirror)
-        if add_form_errors_to_xml(el, f):
+        if add_form_errors_to_xml(pagenode, f):
             f.save()
 
     mirror.add_to_xml(ET, el)
@@ -237,11 +237,11 @@
 
 def add_mirror(request):
     doc, root = get_xmldoc('New mirror', request)
-    el = ET.SubElement(root, 'newftpmirror')
+    pagenode = ET.SubElement(root, 'newftpmirror')
 
     if request.method == 'POST':
         f = models.FtpmirrorsForm(request.POST)
-        if add_form_errors_to_xml(el, f):
+        if add_form_errors_to_xml(pagenode, f):
             mirror = f.save()
             return HttpResponseRedirect(u'../edit/%s' % unicode(mirror.id))