mango r217 - in branches/django: . mango

[ovitters svn gnome org]

Author: ovitters
Date: Sun Jun 22 00:10:45 2008
New Revision: 217
URL: http://svn.gnome.org/viewvc/mango?rev=217&view=rev

Log:
	* mango/settings.py (ault): Hard code the base_url for now.
	* mango/views.py (get_xmlresponse, list_users, edit_user, test_index,
	  list_accounts): Make get_xmlresponse use base_url to provide a
	  reference to the XSLT template. Change existing usage of this
	  function to match changed functionality.


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

Modified: branches/django/mango/settings.py
==============================================================================
--- branches/django/mango/settings.py	(original)
+++ branches/django/mango/settings.py	Sun Jun 22 00:10:45 2008
@@ -142,5 +142,5 @@
         
         break
 
-    MANGO_CFG['base_url'] = 'http://localhost/mango/django/www'
+MANGO_CFG['base_url'] = 'http://localhost/mango/django/www'
 

Modified: branches/django/mango/views.py
==============================================================================
--- branches/django/mango/views.py	(original)
+++ branches/django/mango/views.py	Sun Jun 22 00:10:45 2008
@@ -32,7 +32,7 @@
     if response is None:
         response = HttpResponse(mimetype='text/xml')
 
-    response.write(ET.tostring(ET.ProcessingInstruction('xml-stylesheet', 'href="%s" type="text/xsl"' % template)))
+    response.write(ET.tostring(ET.ProcessingInstruction('xml-stylesheet', 'href="%s/%s" type="text/xsl"' % (settings.MANGO_CFG['base_url'], template))))
     doc.write(response, 'utf-8')
     return response
 
@@ -65,7 +65,7 @@
         node = ET.SubElement(usernode, 'email')
         node.text = user.mail
 
-    return get_xmlresponse(doc, "../www/list_users.xsl")
+    return get_xmlresponse(doc, "list_users.xsl")
 
 def edit_user(request, user):
     doc, root = get_xmldoc('Update user %s' % user, request)
@@ -98,7 +98,7 @@
     for group in user.groups:
         node = ET.SubElement(el, 'group', {'cn': group.cn})
 
-    return get_xmlresponse(doc, "../../../www/update_user.xsl")
+    return get_xmlresponse(doc, "update_user.xsl")
 
 
 
@@ -106,7 +106,7 @@
     doc, root = get_xmldoc('Login Page', request)
     root.append(ET.Element('homepage'))
 
-    return get_xmlresponse(doc, "../www/index.xsl")
+    return get_xmlresponse(doc, "index.xsl")
 
 def list_accounts(request):
     doc, root = get_xmldoc('List Accounts', request)
@@ -124,6 +124,6 @@
 
             el3 = ET.SubElement(el2g, 'group', d)
 
-    return get_xmlresponse(doc, "../www/list_accounts.xsl")
+    return get_xmlresponse(doc, "list_accounts.xsl")