Commits

Simone Marzola committed 76f794a Merge

merged in artichoke updates

  • Participants
  • Parent commits e0656b3, 27d6b2f

Comments (0)

Files changed (1)

File artichoke/controller.py

 
     if template == 'json':
         content_type = 'application/json'
+        template = None
 
     def decorate(f):
         f.exposed = True
         if not hasattr(f, 'artichoke'):
             f.artichoke = {}
 
-        f.artichoke['template'] = template if content_type == 'text/html' else None
+        f.artichoke['template'] = template
         f.artichoke['content-type'] = content_type
         return f
     return decorate