diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-19 20:00:35 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-19 20:00:35 -0500 |
| commit | 0692c01e4c7b88ce94fe023607109fb978c36c2e (patch) | |
| tree | c906a6068f9d3d5e84b1e66bf063e57bbbd70a47 /mediagoblin/db | |
| parent | 079868489479550d9d8190cde6109cc39cd6272c (diff) | |
| parent | 44e51d3464e719e596e1480b7af2957742a9085b (diff) | |
| download | mediagoblin-0692c01e4c7b88ce94fe023607109fb978c36c2e.tar.lz mediagoblin-0692c01e4c7b88ce94fe023607109fb978c36c2e.tar.xz mediagoblin-0692c01e4c7b88ce94fe023607109fb978c36c2e.zip | |
Merge remote branch 'remotes/jwandborg/issue_363'
Conflicts:
setup.py
Diffstat (limited to 'mediagoblin/db')
| -rw-r--r-- | mediagoblin/db/models.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index d77cf619..e034cc29 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -73,7 +73,8 @@ class MediaEntry(Document): 'title': unicode, 'slug': unicode, 'created': datetime.datetime, - 'description': unicode, + 'description': unicode, # May contain markdown/up + 'description_html': unicode, # May contain plaintext, or HTML 'media_type': unicode, 'media_data': dict, # extra data relevant to this media_type 'plugin_data': dict, # plugins can dump stuff here. |