Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
etch
nuages
Commits
7050cb1d
Commit
7050cb1d
authored
Jun 10, 2013
by
Christophe Siraut
Browse files
Cleanup.
parent
2398b719
Changes
3
Hide whitespace changes
Inline
Side-by-side
account/views.py
View file @
7050cb1d
...
...
@@ -35,3 +35,7 @@ def profile(request):
form
=
UserProfileForm
(
instance
=
request
.
user
.
userprofile
)
return
render
(
request
,
"form.html"
,
{
'form'
:
form
})
def
clear_cookie
(
request
,
poll_id
):
request
.
session
.
clear
()
return
HttpResponseRedirect
(
reverse
(
'vote'
,
args
=
(
poll_id
,)))
meetingpoll/userviews.py
deleted
100644 → 0
View file @
2398b719
from
django
import
forms
from
django.contrib.auth.forms
import
UserCreationForm
from
django.http
import
HttpResponseRedirect
from
django.shortcuts
import
render_to_response
from
django.template
import
RequestContext
from
django.core.urlresolvers
import
reverse
def
register
(
request
):
if
request
.
method
==
'POST'
:
form
=
UserCreationForm
(
request
.
POST
)
if
form
.
is_valid
():
new_user
=
form
.
save
()
return
HttpResponseRedirect
(
"/user/success"
)
else
:
form
=
UserCreationForm
()
return
render_to_response
(
"registration/register.html"
,
{
'form'
:
form
,
},
context_instance
=
RequestContext
(
request
))
def
clear_cookie
(
request
,
poll_id
):
request
.
session
.
clear
()
return
HttpResponseRedirect
(
reverse
(
'vote'
,
args
=
(
poll_id
,)))
nuages/urls.py
View file @
7050cb1d
...
...
@@ -15,23 +15,20 @@ urlpatterns = patterns('',
url
(
r
'^$'
,
ListView
.
as_view
(
queryset
=
Poll
.
objects
.
all
(),
template_name
=
'index.html'
),
name
=
'home'
),
url
(
r
'^nuages/$'
,
TemplateView
.
as_view
(
template_name
=
'nuages.html'
),
name
=
'documentation'
),
url
(
r
'^languages/$'
,
TemplateView
.
as_view
(
template_name
=
'languages.html'
),
name
=
'languages'
),
url
(
r
'^(?P<poll_id>\w{4})/$'
,
'meetingpoll.views.vote'
),
url
(
r
'^(?P<poll_id>\w{5})/$'
,
'meetingpoll.views.vote'
),
url
(
r
'^new/$'
,
'meetingpoll.views.new'
,
name
=
'new'
),
url
(
r
'^(?P<pk>\w
+
)/edit/$'
,
login_required
(
UpdateView
.
as_view
(
url
(
r
'^(?P<pk>\w
{4,6}
)/edit/$'
,
login_required
(
UpdateView
.
as_view
(
queryset
=
Poll
.
objects
.
all
(),
form_class
=
PollForm
,
success_url
=
'choices/'
))),
url
(
r
'^(?P<poll_id>\w+)/delete/$'
,
'meetingpoll.views.delete'
),
url
(
r
'^(?P<poll_id>\w+)/edit/choices/$'
,
'meetingpoll.views.editchoices'
,
name
=
'choices'
),
url
(
r
'^(?P<poll_id>\w{4})/vote/$'
,
'meetingpoll.views.vote'
,
name
=
'vote'
),
url
(
r
'^(?P<poll_id>\w{5})/vote/$'
,
'meetingpoll.views.vote'
,
name
=
'vote'
),
url
(
r
'^(?P<poll_id>\w+)/csv/$'
,
'meetingpoll.views.exp_csv'
),
url
(
r
'^(?P<poll_id>\w{4,6})/$'
,
'meetingpoll.views.vote'
),
url
(
r
'^(?P<poll_id>\w{4,6})/delete/$'
,
'meetingpoll.views.delete'
),
url
(
r
'^(?P<poll_id>\w{4,6})/edit/choices/$'
,
'meetingpoll.views.editchoices'
,
name
=
'choices'
),
url
(
r
'^(?P<poll_id>\w{4,6})/vote/$'
,
'meetingpoll.views.vote'
,
name
=
'vote'
),
url
(
r
'^(?P<poll_id>\w{4,6})/csv/$'
,
'meetingpoll.views.exp_csv'
),
url
(
r
'^(?P<poll_id>\w{4,6})/clear/'
,
'account.view.clear_cookie'
),
url
(
r
'^accounts/profile/$'
,
'account.views.profile'
,
name
=
'profile'
),
url
(
r
'^accounts/'
,
include
(
'registration.backends.default.urls'
)),
url
(
r
'^i18n/'
,
include
(
'django.conf.urls.i18n'
)),
url
(
r
'^(?P<poll_id>\w{4})/clear/'
,
'meetingpoll.userviews.clear_cookie'
),
url
(
r
'^(?P<poll_id>\w{5})/clear/'
,
'meetingpoll.userviews.clear_cookie'
),
url
(
r
'^admin/'
,
include
(
admin
.
site
.
urls
)),
url
(
r
'^admin/doc/'
,
include
(
'django.contrib.admindocs.urls'
)),
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment