Revision 2e5c33db lib/rapi/rlib2.py

b/lib/rapi/rlib2.py
1189 1189
  GET_OPCODE = opcodes.OpQuery
1190 1190
  PUT_OPCODE = opcodes.OpQuery
1191 1191

  
1192
  def _Query(self, fields, filter_):
1193
    return self.GetClient().Query(self.items[0], fields, filter_).ToDict()
1192
  def _Query(self, fields, qfilter):
1193
    return self.GetClient().Query(self.items[0], fields, qfilter).ToDict()
1194 1194

  
1195 1195
  def GET(self):
1196 1196
    """Returns resource information.
......
1215 1215
    except KeyError:
1216 1216
      fields = _GetQueryFields(self.queryargs)
1217 1217

  
1218
    return self._Query(fields, self.request_body.get("filter", None))
1218
    qfilter = body.get("qfilter", None)
1219
    # TODO: remove this after 2.7
1220
    if qfilter is None:
1221
      qfilter = body.get("filter", None)
1222

  
1223
    return self._Query(fields, qfilter)
1219 1224

  
1220 1225

  
1221 1226
class R_2_query_fields(baserlib.ResourceBase):

Also available in: Unified diff