Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
belenios
belenios
Commits
cef0a503
Commit
cef0a503
authored
Jun 21, 2013
by
Stephane Glondu
Browse files
Unset Services.ballot at appropriate times
parent
469d265b
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/web/registration.ml
View file @
cef0a503
...
...
@@ -159,6 +159,7 @@ let if_eligible acl f uuid x =
let
()
=
Eliom_registration
.
Html5
.
register
~
service
:
Services
.
home
(
fun
()
()
->
Eliom_reference
.
unset
Services
.
ballot
>>
Eliom_reference
.
unset
Services
.
saved_service
>>
lwt
featured
=
get_featured_elections
()
in
Templates
.
index
~
featured
)
...
...
@@ -230,6 +231,7 @@ let () = Eliom_registration.Redirection.register
~
service
:
Services
.
logout
(
fun
()
()
->
lwt
user
=
Eliom_reference
.
get
Services
.
user
in
(* should ballot be unset here or not? *)
Eliom_reference
.
unset
Services
.
user
>>
match
user
with
|
Some
user
when
user
.
Web_common
.
user_type
=
Web_common
.
CAS
->
...
...
@@ -323,6 +325,7 @@ let () = Eliom_registration.Html5.register
~
service
:
Services
.
election_index
(
if_eligible
can_read
(
fun
uuid
election
user
()
->
Eliom_reference
.
unset
Services
.
ballot
>>
Eliom_reference
.
set
Services
.
saved_service
(
Services
.
Election
uuid
)
>>
Templates
.
election_view
~
election
~
user
)
...
...
@@ -332,6 +335,7 @@ let () = Eliom_registration.Redirection.register
~
service
:
Services
.
election_vote
(
if_eligible
can_read
(
fun
uuid
election
user
()
->
Eliom_reference
.
unset
Services
.
ballot
>>
Eliom_reference
.
set
Services
.
saved_service
(
Services
.
Election
uuid
)
>>
return
(
Services
.
make_booth
uuid
)
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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