Merge remote-tracking branch 'origin/master' into development

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
2017-07-29 01:55:42 -04:00
parent 17b7d6f25e 6a8868e632
commit ba1ab5d4f1
1677 changed files with 40824 additions and 21204 deletions
@@ -1,6 +1,8 @@
 from __future__ import unicode_literals
 from django.utils.html import format_html_join

+from django.utils.html import format_html_join
+

 def get_metadata_string(document):
    """
@@ -8,7 +10,9 @@ def get_metadata_string(document):
    """
    return format_html_join(
        '\n', '<div class="metadata-display"><b>{}: </b><span data-metadata-type="{}" data-pk="{}">{}</span></div>',
-        ((document_metadata.metadata_type,document_metadata.metadata_type_id,document_metadata.id,document_metadata.value)
-            for document_metadata in document.metadata.all()
+        (
+            (
+                document_metadata.metadata_type, document_metadata.metadata_type_id, document_metadata.id, document_metadata.value
+            ) for document_metadata in document.metadata.all()
        )
    )