working calendar queries

1 files changed, 19 insertions, 4 deletions

diff --git a/lib/webcals/request/calendar_query.js b/lib/webcals/request/calendar_query.js
index b39853f..b9a350d 100644
--- a/lib/webcals/request/calendar_query.js
+++ b/lib/webcals/request/calendar_query.js
@@ -2,6 +2,7 @@
 
   var Propfind = ns.require('request/propfind');
   var CalendarData = ns.require('templates/calendar_data');
+  var CalendarFilter = ns.require('templates/calendar_filter');
 
   /**
    * Creates a calendar query request.
@@ -17,16 +18,30 @@
     this.xhr.headers['Depth'] = this.depth || 1;
     this.xhr.method = 'REPORT';
     this.fields = new CalendarData();
-    this.template.rootTag = 'calendar-query';
+    this.filters = new CalendarFilter();
+
+    this.template.rootTag = ['caldav', 'calendar-query'];
   }
 
   CalendarQuery.prototype = {
     __proto__: Propfind.prototype,
 
     _createPayload: function() {
-      var props = this._props.join('');
-      props += this.fields.render(this.template);
-      var content = this.template.tag('prop', props);
+      var content;
+      var props;
+
+      props = this._props.join('');
+
+      if (this.fields) {
+        props += this.fields.render(this.template);
+      }
+
+      content = this.template.tag('prop', props);
+
+      if (this.filters) {
+        content += this.filters.render(this.template);
+      }
+
       return this.template.render(content);
     }