Changes between Version 56 and Version 57 of GenshiTutorial

Timestamp:

Aug 31, 2007, 7:32:41 PM (16 years ago)

Author:

cmlenz

Comment:

--

GenshiTutorial

@@ -1118 +1118 @@
 }}}
 
-For convenience, let's now add a new small module to our `lib` package. Inside the `geddit/lib` directory, create a file named `ajax`, and add the following code to it:
+We'll also need to make the display of an individual comment available as an HTML fragment, so let's factor it out into a separate template file, too.
+
+Add a template called `_comment.html` to the `geddit/templates` directory, and insert the following lines:
+
+{{{
+#!genshi
+<li id="comment$num">
+  <strong>${comment.username}</strong> at ${comment.time.strftime('%x %X')}
+  <blockquote>${comment.content}</blockquote>
+</li>
+}}}
+
+And in `geddit/templates/info.html` replace the `<ul>` element rendering the comments with the following:
+
+{{{
+#!genshi
+    <ul py:if="link.comments" class="comments">
+      <xi:include href="_comment.html"
+          py:for="num, comment in enumerate(link.comments)" />
+    </ul>
+}}}
+
+Now we'll need to look into modifying the `Root.comment()` method so that it correctly deals with the AJAX requests we'll be adding.
+
+For convenience, let's add a new small module to our `lib` package. Inside the `geddit/lib` directory, create a file named `ajax`, and add the following code to it:
 
 {{{
@@ -1130 +1154 @@
 
 This checks whether the current request originates from usage of AJAX (technically, the `XMLHttpRequest` Javascript object), based on a convention commonly used in Javascript libraries to add the special HTTP header “`X-Requested-With: XMLHttpRequest`” to all requests.
+
+Add an import of that module to the top of the `geddit/controller.py` file, replacing:
+
+{{{
+#!python
+from geddit.lib import template
+}}}
+
+with:
+
+{{{
+#!python
+from geddit.lib import ajax, template
+}}}
+
+Then, replace the `Root.comment()` method in `geddit/controller.py` with the following code:
+
+{{{
+#!python
+    @cherrypy.expose
+    @template.output('comment.html')
+    def comment(self, id, cancel=False, **data):
+        link = self.data.get(id)
+        if not link:
+            raise cherrypy.NotFound()
+        if cherrypy.request.method == 'POST':
+            if cancel:
+                raise cherrypy.HTTPRedirect('/info/%s' % link.id)
+            form = CommentForm()
+            try:
+                data = form.to_python(data)
+                comment = link.add_comment(**data)
+                if not ajax.is_xhr():
+                    raise cherrypy.HTTPRedirect('/info/%s' % link.id)
+                return template.render('_comment.html', comment=comment,
+                                       num=len(link.comments))
+            except Invalid, e:
+                errors = e.unpack_errors()
+        else:
+            errors = {}
+
+        if ajax.is_xhr():
+            stream = template.render('_form.html', link=link, errors=errors)
+        else:
+            stream = template.render(link=link, comment=None, errors=errors)
+        return stream | HTMLFormFiller(data=data)
+}}}