heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'remotes/aaronw/feature410_markdown_bio'

Browse Source
This commit is contained in:
Christopher Allan Webber 2011-07-13 23:19:46 -05:00
commit fb5075e6b2
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mediagoblin/db/models.py
View File

@ -46,7 +46,8 @@ class User(Document):
'verification_key': unicode, 'verification_key': unicode,
'is_admin': bool, 'is_admin': bool,
'url' : unicode, 'url' : unicode,
'bio' : unicode 'bio' : unicode, # May contain markdown
'bio_html': unicode, # May contain plaintext, or HTML
} }
required_fields = ['username', 'created', 'pw_hash', 'email'] required_fields = ['username', 'created', 'pw_hash', 'email']

4
mediagoblin/edit/views.py
View File

@ -101,6 +101,10 @@ def edit_profile(request):
if request.method == 'POST' and form.validate(): if request.method == 'POST' and form.validate():
user['url'] = request.POST['url'] user['url'] = request.POST['url']
user['bio'] = request.POST['bio'] user['bio'] = request.POST['bio']
md = markdown.Markdown(safe_mode = 'escape')
user['bio_html'] = clean_html(md.convert(user['bio']))
user.save() user.save()
messages.add_message(request, messages.add_message(request,

6
mediagoblin/templates/mediagoblin/utils/profile.html
View File

@ -18,9 +18,9 @@
{% block profile_content -%} {% block profile_content -%}
{% if user.bio %} {% if user.bio %}
<p> {% autoescape False %}
{{ user.bio }} <p>{{ user.bio_html }}</p>
</p> {% endautoescape %}
{% endif %} {% endif %}
{% if user.url %} {% if user.url %}
<p> <p>