Skip to content

E
edx-notes-api
Commit 5323ac5b by Tim Babych Committed by Oleg Marshev
Options

remove doc conflict

parent 2a87bd08
Showing with 0 additions and 6 deletions
notesapi/v1/models.py
...@@ -123,17 +123,11 @@ class NoteMappingType(MappingType, Indexable): ...@@ -123,17 +123,11 @@ class NoteMappingType(MappingType, Indexable):
@staticmethod @staticmethod
def process_result(data): def process_result(data):
""" """
<<<<<<< HEAD
Prepares result for response.
Also prepares ranges field and highlighting.
=======
Unlistifies the result and replaces `text` with highlihted one Unlistifies the result and replaces `text` with highlihted one
Unlistification: ElasticUtils returns data as [{field:value,..}..] which is not what needed. Unlistification: ElasticUtils returns data as [{field:value,..}..] which is not what needed.
this function reverses the effect to get the original value. this function reverses the effect to get the original value.
Also filed https://github.com/mozilla/elasticutils/pull/285 to make it unnecessary. Also filed https://github.com/mozilla/elasticutils/pull/285 to make it unnecessary.
>>>>>>> specify ElastiUtils more precisely, add docstrings
""" """
for i, item in enumerate(data): for i, item in enumerate(data):
if isinstance(item, dict): if isinstance(item, dict):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment