Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
belenios
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
belenios
belenios
Commits
100e6083
Commit
100e6083
authored
Jun 01, 2018
by
Stephane Glondu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show personal data processing notice to election administrators
parent
34bfcb7e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
0 deletions
+32
-0
src/web/web_services.ml
src/web/web_services.ml
+1
-0
src/web/web_site.ml
src/web/web_site.ml
+9
-0
src/web/web_templates.ml
src/web/web_templates.ml
+21
-0
src/web/web_templates.mli
src/web/web_templates.mli
+1
-0
No files found.
src/web/web_services.ml
View file @
100e6083
...
...
@@ -26,6 +26,7 @@ open Web_common
let
home
=
service
~
path
:
[
""
]
~
get_params
:
unit
()
let
admin
=
service
~
path
:
[
"admin"
]
~
get_params
:
unit
()
let
admin_gdpr_accept
=
post_coservice
~
csrf_safe
:
true
~
fallback
:
admin
~
post_params
:
unit
()
let
site_login
=
service
~
path
:
[
"login"
]
~
get_params
:
(
opt
(
string
"service"
))
()
let
logout
=
service
~
path
:
[
"logout"
]
~
get_params
:
unit
()
...
...
src/web/web_site.ml
View file @
100e6083
...
...
@@ -327,8 +327,17 @@ let with_site_user f =
|
Some
u
->
f
u
|
None
->
forbidden
()
let
()
=
Redirection
.
register
~
service
:
admin_gdpr_accept
(
fun
()
()
->
Eliom_reference
.
set
Web_state
.
show_cookie_disclaimer
false
>>
return
admin
)
let
()
=
Html5
.
register
~
service
:
admin
(
fun
()
()
->
let
%
lwt
gdpr
=
Eliom_reference
.
get
Web_state
.
show_cookie_disclaimer
in
if
gdpr
then
T
.
admin_gdpr
()
else
let
cont
()
=
Redirection
.
send
admin
in
Eliom_reference
.
set
Web_state
.
cont
[
cont
]
>>
let
%
lwt
site_user
=
Web_state
.
get_site_user
()
in
...
...
src/web/web_templates.ml
View file @
100e6083
...
...
@@ -173,6 +173,27 @@ let format_election election =
let
unsafe_a
uri
text
=
Printf
.
ksprintf
Unsafe
.
data
"<a href=
\"
%s
\"
>%s</a>"
uri
text
let
admin_gdpr
()
=
let
title
=
site_title
^
" — Personal data processing notice"
in
let
content
=
[
div
[
pcdata
"To use this site, you must accept our "
;
unsafe_a
!
gdpr_uri
"personal data policy"
;
pcdata
"."
;
];
post_form
~
service
:
admin_gdpr_accept
(
fun
()
->
[
div
[
string_input
~
input_type
:
`Submit
~
value
:
"Accept"
()
;
];
]
)
()
;
]
in
base
~
title
~
content
()
let
admin
~
elections
()
=
let
title
=
site_title
^
" — Administration"
in
match
elections
with
...
...
src/web/web_templates.mli
View file @
100e6083
...
...
@@ -23,6 +23,7 @@ open Serializable_t
open
Web_serializable_t
open
Signatures
val
admin_gdpr
:
unit
->
[
>
`Html
]
Eliom_content
.
Html5
.
F
.
elt
Lwt
.
t
val
admin
:
elections
:
(
'
a
election
list
*
'
a
election
list
*
'
a
election
list
*
(
uuid
*
string
)
list
)
option
->
unit
->
[
>
`Html
]
Eliom_content
.
Html5
.
F
.
elt
Lwt
.
t
val
new_election_failure
:
[
`Exists
|
`Exception
of
exn
]
->
unit
->
[
>
`Html
]
Eliom_content
.
Html5
.
F
.
elt
Lwt
.
t
...
...
Write
Preview
Markdown
is supported
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