Merge 291fbdc into 60b0dc3

allegro · Jun 17, 2014 · c7b10d0 · c7b10d0
2 parents 60b0dc3 + 291fbdc
commit c7b10d0
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/ralph/cmdb/integration/sync.py b/src/ralph/cmdb/integration/sync.py
@@ -150,7 +150,7 @@ def get_ci(**kwargs):
                 cis = []
             else:
                 cis = [ci for ci in [
-                    get_ci(id=id) for id in issue['cis']
+                    get_ci(uid=uid) for uid in issue['cis']
                 ] if ci]
 
         obj = classtype.objects.filter(jira_id=issue.get('key')).all()[:1]
@@ -201,9 +201,8 @@ def fetch_all(self, type, cutoff_date=None):
         ]
         jql = ('type={}'.format(type))
         if cutoff_date is not None:
-            jql += " AND status CHANGED AFTER '{}'".format(
-                cutoff_date.strftime('%Y/%m/%d %H:%m')
-            )
+            jql += " AND (status CHANGED AFTER '{c}' OR created > '{c}')".\
+                format(c=cutoff_date.strftime('%Y/%m/%d %H:%m'))
         params = dict(jql=jql)
         offset = 0
         total = None