1.1 --- a/lfapi/main.js	Sun Nov 06 21:18:58 2011 +0100
     1.2 +++ b/lfapi/main.js	Sat Feb 25 21:56:55 2012 +0100
     1.3 @@ -128,7 +128,7 @@
     1.4  function addRelatedData(conn, req, res, result, includes) {
     1.5    if (includes.length > 0) {
     1.6      var include = includes.shift();
     1.7 -    var class = include.class;
     1.8 +    var clazz = include.clazz;
     1.9      var objects = result[include.objects];
    1.10  
    1.11      var query;
    1.12 @@ -140,8 +140,8 @@
    1.13          if (objects.length > 0) {
    1.14            objects_exists = true;
    1.15            objects.forEach( function(object) {
    1.16 -            if (object[class + "_id"]) {
    1.17 -              ids_hash[object[class + "_id"]] = true;
    1.18 +            if (object[clazz + "_id"]) {
    1.19 +              ids_hash[object[clazz + "_id"]] = true;
    1.20              };
    1.21            });
    1.22          }
    1.23 @@ -149,8 +149,8 @@
    1.24          for (var key in objects) {
    1.25            objects_exists = true;
    1.26            var object = objects[key];
    1.27 -          if (object[class + "_id"]) {
    1.28 -            ids_hash[object[class + "_id"]] = true;
    1.29 +          if (object[clazz + "_id"]) {
    1.30 +            ids_hash[object[clazz + "_id"]] = true;
    1.31            };
    1.32          };
    1.33        };
    1.34 @@ -162,9 +162,9 @@
    1.35          }
    1.36          if (ids.length > 0) {
    1.37            query = new selector.Selector();
    1.38 -          query.from(class);
    1.39 -          query.addWhere([class + '.id IN (??)', ids]);
    1.40 -          fields.addObjectFields(query, class);
    1.41 +          query.from(clazz);
    1.42 +          query.addWhere([clazz + '.id IN (??)', ids]);
    1.43 +          fields.addObjectFields(query, clazz);
    1.44          }
    1.45        };
    1.46      };
    1.47 @@ -178,10 +178,10 @@
    1.48          });
    1.49        };
    1.50               
    1.51 -      if (class == 'policy') {
    1.52 +      if (clazz == 'policy') {
    1.53          result['policies'] = tmp;
    1.54        } else {
    1.55 -        result[class + 's'] = tmp;
    1.56 +        result[clazz + 's'] = tmp;
    1.57        }
    1.58        addRelatedData(conn, req, res, result, includes);
    1.59      });
    1.60 @@ -820,6 +820,7 @@
    1.61        db.query(conn, req, res, query, function (initiator, conn) {
    1.62          var result = { result: initiator.rows }
    1.63          includes = [];
    1.64 +        if (params.include_members) includes.push({ class: 'member', objects: 'result'});
    1.65          if (params.include_initiatives) includes.push({ class: 'initiative', objects: 'result'});
    1.66          if (params.include_issues) includes.push({ class: 'issue', objects: 'initiatives'});
    1.67          if (params.include_areas) includes.push({ class: 'area', objects: 'issues'});