From ce03424b400dd11ff124134d1fb6278e52a20837 Mon Sep 17 00:00:00 2001 From: eddumm22 Date: Fri, 19 Sep 2014 11:51:00 -0300 Subject: [PATCH] add SoftwareList filtering --- wscserver/view/restfulview.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/wscserver/view/restfulview.py b/wscserver/view/restfulview.py index 00db1b4..5735d8a 100644 --- a/wscserver/view/restfulview.py +++ b/wscserver/view/restfulview.py @@ -68,15 +68,21 @@ class CustomRESTfulView(RESTfulView): property_ = collection_element.nm_property_name property_value = collection_element.te_class_property_value - if class_ not in self.computer_filter: - # Filter classes + if class_ == 'SoftwareList': + if computer.get(class_) is None: + computer[class_] = [ ] + elif property_value.lower().find('office') > -1: + computer[class_].append(property_value) + elif property_value.lower().find('microsoft') > -1: + computer[class_].append(property_value) continue - if property_ not in self.computer_filter[class_]: - # Filter properties + elif class_ not in self.computer_filter \ + or property_ not in self.computer_filter[class_]: + # Filter classes and properties continue - if computer.get(class_) is None: + elif computer.get(class_) is None: computer[class_] = { } else: prefixed_property = class_ + '_' + property_ -- libgit2 0.21.2