Added formats, various form improvements, more refactoring/cleanup

1 files changed, 7 insertions, 1 deletions

diff --git a/src/rest/emitters.py b/src/rest/emitters.py
index b911f31c..c1ff5cc2 100644
--- a/src/rest/emitters.py
+++ b/src/rest/emitters.py
@@ -3,6 +3,8 @@ import json
 from utils import dict2xml
 
 class BaseEmitter(object):
+    uses_forms = False
+
     def __init__(self, resource):
         self.resource = resource
 
@@ -24,11 +26,14 @@ class TemplatedEmitter(BaseEmitter):
             'resource': self.resource,
         })
         
+        ret = template.render(context)
+
         # Munge DELETE Response code to allow us to return content
+        # (Do this *after* we've rendered the template so that we include the normal deletion response code in the output)
         if self.resource.resp_status == 204:
             self.resource.resp_status = 200
 
-        return template.render(context)
+        return ret
 
 class JSONEmitter(BaseEmitter):
     def emit(self, output):
@@ -46,6 +51,7 @@ class XMLEmitter(BaseEmitter):
 
 class HTMLEmitter(TemplatedEmitter):
     template = 'emitter.html'
+    uses_forms = True
 
 class TextEmitter(TemplatedEmitter):
     template = 'emitter.txt'