From: yomguy Date: Wed, 6 Jun 2012 11:04:03 +0000 (+0200) Subject: add (telemeta) users/xxx/profile view X-Git-Tag: 0.5^2~15 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ad48d2bac0e0da7e29ebab37c2b69fcb28a65de6;p=teleforma.git add (telemeta) users/xxx/profile view --- diff --git a/teleforma/templates/telemeta/inc/user_list.html b/teleforma/templates/telemeta/inc/user_list.html index d6c8a010..5dfcef22 100644 --- a/teleforma/templates/telemeta/inc/user_list.html +++ b/teleforma/templates/telemeta/inc/user_list.html @@ -31,8 +31,8 @@ {% for user in page.object_list %} - {{ user.last_name }} - {{ user.first_name }} + {{ user.last_name }} + {{ user.first_name }} {% if user.student.get %} {% with user.student.get as student %} diff --git a/teleforma/urls.py b/teleforma/urls.py index 9b2c3f14..0a39d6e3 100644 --- a/teleforma/urls.py +++ b/teleforma/urls.py @@ -38,10 +38,12 @@ from django.views.generic import * from django.views.generic.base import * from teleforma.models import * from teleforma.views import * +from telemeta.views import * from jsonrpc import jsonrpc_site htdocs_forma = os.path.dirname(__file__) + '/static/teleforma/' user_export = UsersXLSExport() +profile_view = ProfileView() urlpatterns = patterns('', @@ -61,6 +63,8 @@ urlpatterns = patterns('', # Users url(r'^users/$', UsersView.as_view(), name="teleforma-users"), + url(r'^users/(?P[A-Za-z0-9._-]+)/profile/$', profile_view.profile_detail, + name="teleforma-profile-detail"), url(r'^users/(?P.*)/login/$', UserLoginView.as_view(), name="teleforma-user-login"), url(r'^users/all/export/$', user_export.all, name="teleforma-users-xls-export"),