Ultimate fix for the search query problem.

[osqa.git] / forum / urls.py

diff --git a/forum/urls.py b/forum/urls.py
index 6bb315dbdc2b927e550788416725275e7136ba4b..1d8b213e5b2f5d77ba134f3bb8170c05be71274a 100644 (file)
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -69,7 +69,8 @@ urlpatterns += patterns('',
                             kwargs=dict(close=True), name='close'),
                         url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('reopen/')), app.commands.close,
                             kwargs=dict(close=False), name='reopen'),
-                        url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('answer/')), app.writers.answer, name='answer'),
+                        url(r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('answer/')), app.writers.answer, name='answer'),                        
+                        url(r'^%s(?P<action>\w+)/$' % _('pending-data/'), app.writers.manage_pending_data, name='manage_pending_data'),
 
                         url(r'^%s(?P<id>\d+)/(?P<vote_type>[a-z]+)/' % _('vote/'), app.commands.vote_post,
                             name='vote_post'),
@@ -144,8 +145,6 @@ urlpatterns += patterns('',
 
                         url(r'^%s%s$' % (_('account/'), _('signin/')), app.auth.signin_page, name='auth_signin'),
                         url(r'^%s%s$' % (_('account/'), _('signout/')), app.auth.signout, name='user_signout'),
-                        url(r'^%s%s(?P<action>\w+)/$' % (_('account/'), _('signin/')), app.auth.signin_page,
-                            name='auth_action_signin'),
                         url(r'^%s(?P<provider>\w+)/%s$' % (_('account/'), _('signin/')),
                             app.auth.prepare_provider_signin, name='auth_provider_signin'),
                         url(r'^%s(?P<provider>\w+)/%s$' % (_('account/'), _('done/')), app.auth.process_provider_signin,
@@ -164,6 +163,7 @@ urlpatterns += patterns('',
                             app.auth.remove_external_provider, name='user_remove_external_provider'),
                         url(r'^%s%s%s$' % (_('account/'), _('providers/'), _('add/')), app.auth.signin_page,
                             name='user_add_external_provider'),
+                        url(r'^%s%s$' %(_('account/'), _('send-validation/')), app.auth.send_validation_email, name="send_validation_email"),
 
 
                         url(r'^%s$' % _('admin/'), app.admin.dashboard, name="admin_index"),