Fix easeofresolution in Vulns

model/controller.py

@@ -393,21 +393,20 @@ def __addPendingAction(self, *args):
 
     def addUpdate(self, old_object, new_object):
         # Returns True if the update was resolved without user interaction
-        res = True
         try:
             mergeAction = old_object.addUpdate(new_object)
             if mergeAction:
                 if old_object not in self.objects_with_updates:
                     self.objects_with_updates.append(old_object)
                 notifier.conflictUpdate(1)
-                res = False
+                return False
         except:
-            res = False
             api.devlog("(%s).addUpdate(%s, %s) - failed" %
                        (self, old_object, new_object))
+            return False
         self.mappers_manager.update(old_object)
         notifier.editHost(old_object)
-        return res
+        return True
 
     def find(self, obj_id):
         return self.mappers_manager.find(obj_id)

persistence/server/models.py

@@ -669,7 +669,6 @@ def __init__(self, vuln, workspace_name):
         self.severity = vuln['value']['severity']
         self.refs = vuln['value']['refs']
         self.confirmed = vuln['value']['confirmed']
-        self.easeofresolution = vuln['value']['easeofresolution']
         self.resolution = vuln['value']['resolution']
 
     @staticmethod
@@ -734,7 +733,7 @@ def updateAttributes(self, name=None, desc=None, data=None,
         if data is not None:
             self.data = data
         if resolution is not None:
-            self.easeofresolution = resolution
+            self.resolution = resolution
         if severity is not None:
             self.severity = self.standarize(severity)
         if refs is not None:

persistence/server/server.py

@@ -5,7 +5,7 @@
 
 # NOTE: Change is you want to use this module by itself.
 # If FARADAY_UP is False, SERVER_URL must be a valid faraday server url
-FARADAY_UP = True
+FARADAYs_UP = True
 SERVER_URL = "http://127.0.0.1:5984"
 
 def _get_base_server_url():