Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
beat.web
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
beat
beat.web
Commits
f40abcce
Commit
f40abcce
authored
4 years ago
by
Flavio TARSETTI
Browse files
Options
Downloads
Patches
Plain Diff
[accounts][views] created template pattern to generate response
parent
6a4fab3d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!328
Improve automatic emails with temporary urls
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
beat/web/accounts/views.py
+16
-26
16 additions, 26 deletions
beat/web/accounts/views.py
with
16 additions
and
26 deletions
beat/web/accounts/views.py
+
16
−
26
View file @
f40abcce
...
...
@@ -139,6 +139,15 @@ def account_settings(request):
'
token
'
:
user
.
auth_token
})
def
generate_load_response
(
request
,
temp_url
,
template
,
parameters
):
answer
=
{}
answer
[
"
template
"
]
=
template
answer
[
"
parameters
"
]
=
parameters
temp_url
.
delete
()
return
render
(
request
,
answer
[
"
template
"
],
answer
[
"
parameters
"
])
def
load_temporary_url
(
request
,
hash_url
):
temp_url
=
get_object_or_404
(
TemporaryUrl
,
url_hash
=
hash_url
)
supervisiontrack
=
temp_url
.
supervision_track
...
...
@@ -178,15 +187,10 @@ def load_temporary_url(request, hash_url):
context
,
[
supervisee
.
email
])
temp_url
.
delete
()
return
render
(
request
,
'
accounts/url_validation.html
'
,
{
'
supervisiontrack
'
:
supervisiontrack
})
return
generate_load_response
(
request
,
temp_url
,
"
accounts/url_validation.html
"
,
{
"
supervisiontrack
"
:
supervisiontrack
})
else
:
#Track already valid
temp_url
.
delete
()
return
render
(
request
,
'
accounts/url_validation_failed.html
'
)
return
generate_load_response
(
request
,
temp_url
,
"
accounts/url_validation_failed.html
"
,
{})
elif
temp_url
.
status
==
TemporaryUrl
.
YEARREVALIDATION
:
# Supervisee re-validation
if
supervisee
.
profile
.
supervision_key
is
not
None
and
now
<
temp_url
.
expires
:
...
...
@@ -220,18 +224,12 @@ def load_temporary_url(request, hash_url):
else
:
#Track already valid
error_message
=
"
You don
'
t need to revalidate at the moment, your supervision is still valid
"
temp_url
.
delete
()
return
render
(
request
,
'
accounts/url_revalidation_failed.html
'
,
{
'
error_message
'
:
error_message
})
return
generate_load_response
(
request
,
temp_url
,
"
accounts/url_revalidation_failed.html
"
,
{
"
error_message
"
:
error_message
})
else
:
#A pending request already exist
error_message
=
"
You are not able to perform this action as you already have a pending supervision request
"
temp_url
.
delete
()
return
render
(
request
,
'
accounts/url_revalidation_failed.html
'
,
{
'
error_message
'
:
error_message
})
return
generate_load_response
(
request
,
temp_url
,
"
accounts/url_revalidation_failed.html
"
,
{
"
error_message
"
:
error_message
})
else
:
#No key is present in supervisee
...
...
@@ -247,18 +245,10 @@ def load_temporary_url(request, hash_url):
#Not allowed to do this (unproper profile.status)
error_message
=
"
You are not allowed to perform this action, you first need to get a valid supervision
"
temp_url
.
delete
()
return
render
(
request
,
'
accounts/url_revalidation_failed.html
'
,
{
'
error_message
'
:
error_message
})
return
generate_load_response
(
request
,
temp_url
,
"
accounts/url_revalidation_failed.html
"
,
{
"
error_message
"
:
error_message
})
temp_url
.
delete
()
return
render
(
request
,
'
accounts/url_validation.html
'
,
{
'
supervisiontrack
'
:
supervisiontrack
})
return
generate_load_response
(
request
,
temp_url
,
"
accounts/url_validation.html
"
,
{
'
supervisiontrack
'
:
supervisiontrack
})
else
:
#Track already valid
temp_url
.
delete
()
return
render
(
request
,
'
accounts/url_validation_failed.html
'
)
return
generate_load_response
(
request
,
temp_url
,
"
accounts/url_validation_failed.html
"
,
{})
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment