From 02afd8a32edb13ea7fc2266ac80092ea15c0930c Mon Sep 17 00:00:00 2001 From: Alvin Li Date: Wed, 9 Oct 2013 15:52:53 +0800 Subject: * treat 'apps/utils' as regular django app; which used to store general tools for used in other apps * moved 'templatetags' from 'apps/indicator' to 'apps/utils' * '.gitignore' to ignore 'fixtures_bak' * moved js plugins from 'apps/indicator/static/plugins' to 'staticfiles/plugins' apps/recommend: * updated 'recommend.models'; o commented 'recommend.models.ResearchCombination' (not used) * implemented views 'add_edit_blog_info' and 'ajax_add_edit_configs'; * added pages 'templates/recommend/add_edit_blog_info.html', 'add_edit_blog_info_error.html'; o related css and javascripts files * added 'tools.py'; * added 'utils/tools.py' for placing generic functions; * deleted 'initial_data.json' (mv 'fixtures' to 'fixtures_bak'); * small fixes to 'indicator.models', 'sciblog.models' and 'sfaccount.views' * fixed automatically show 'proper_nouns' annotation in blog: recovered the line 'import signals' in 'sciblog.models' * added 'is_ok()' method for 'recommend.models.ResearchConfig'; --- 97suifangqa/apps/sfaccount/templates/sfaccount/login.html | 2 +- 97suifangqa/apps/sfaccount/views.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to '97suifangqa/apps/sfaccount') diff --git a/97suifangqa/apps/sfaccount/templates/sfaccount/login.html b/97suifangqa/apps/sfaccount/templates/sfaccount/login.html index 6e3be80..46e4bb6 100644 --- a/97suifangqa/apps/sfaccount/templates/sfaccount/login.html +++ b/97suifangqa/apps/sfaccount/templates/sfaccount/login.html @@ -55,6 +55,6 @@   |   忘记密码?

-{% endblock body%} +{% endblock body %} {# vim: set ts=2 sw=2 tw=0 fenc=utf-8 ft=htmldjango.html: #} diff --git a/97suifangqa/apps/sfaccount/views.py b/97suifangqa/apps/sfaccount/views.py index 014dc32..0d26cc2 100644 --- a/97suifangqa/apps/sfaccount/views.py +++ b/97suifangqa/apps/sfaccount/views.py @@ -17,6 +17,8 @@ from sfaccount.forms import ( SFEmailForm, ) +import re + # email address shown in the sent mail FROM_EMAIL = getattr(settings, 'SF_EMAIL').get('display_from') @@ -89,7 +91,7 @@ def activate_view(request, activation_key=None): # ask user for the 'activation_key' activate_key_url = reverse('activate_key', kwargs={'activation_key': 'XXX'}) - activate_key_url = activate_key_url.replace('XXX/', '') + activate_key_url = re.sub(r'XXX/$', '', activate_key_url) data = {'activate_key_url': activate_key_url} return render(request, 'sfaccount/activate.html', data) # }}} -- cgit v1.2.2