merge branch master

composer/report/field.py

@@ -121,9 +121,14 @@ class Field(Component):
         return self.getValue(row)
 
     def getSortValue(self, row):
+<<<<<<< HEAD
         # TODO: consider 'descending' flag (?use raw value instead of formatted one?)
         return self.getValue(row)
         #return getattr(row, self.name, None)
+=======
+        # TODO: consider 'descending' flag
+        return self.getValue(row)
+>>>>>>> master
 
 
 class CalculatedField(Field):

composer/report/result.py

@@ -120,8 +120,17 @@ class ResultSet(object):
             row.sequenceNumber = idx + 1
         return result
 
+    @Lazy
+    def result(self):
+        return self.getResult()
+
     def __iter__(self):
-        return iter(self.getResult())
+        return iter(self.result)
+
+    def first(self):
+        if len(self.result) > 0:
+            return self.result[0]
+        return self.rowFactory(None, self)
 
     @Lazy
     def displayedColumns(self):

organize/work.py

@@ -231,8 +231,10 @@ class WorkItem(Stateful, Track):
 
     def move(self, userName, **kw):
         moved = self.createNew('move', userName, **kw)
+        moved.userName = self.userName
         moved.state = 'moved'
-        moved.reindex('state')
+        #moved.reindex('state')
+        moved.reindex()
         task = kw.pop('task', None)
         new = moved.createNew(None, userName, taskId=task, runId=0, **kw)
         new.userName = self.userName

util/html.py

@@ -79,6 +79,7 @@ def checkStyle(k):
 
 
 def stripAll(value):
+    value = sanitize(value)
     def collectText(tags):
         for tag in tags:
             if type(tag) is NavigableString: