Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
go
Commits
207ee9d5
Commit
207ee9d5
authored
Jan 02, 2017
by
David Haynes
Browse files
PY3 compat reached in views
- plus spacing fixes
parent
6881b662
Changes
1
Hide whitespace changes
Inline
Side-by-side
go/go/views.py
View file @
207ee9d5
...
...
@@ -85,11 +85,11 @@ def index(request):
# Determine what the expiration date is
if
expires
==
URLForm
.
DAY
:
url
.
expires
=
timezone
.
now
()
+
timedelta
(
days
=
1
)
url
.
expires
=
timezone
.
now
()
+
timedelta
(
days
=
1
)
elif
expires
==
URLForm
.
WEEK
:
url
.
expires
=
timezone
.
now
()
+
timedelta
(
weeks
=
1
)
url
.
expires
=
timezone
.
now
()
+
timedelta
(
weeks
=
1
)
elif
expires
==
URLForm
.
MONTH
:
url
.
expires
=
timezone
.
now
()
+
timedelta
(
weeks
=
3
)
url
.
expires
=
timezone
.
now
()
+
timedelta
(
weeks
=
3
)
elif
expires
==
URLForm
.
CUSTOM
:
url
.
expires
=
url_form
.
cleaned_data
.
get
(
'expires_custom'
)
else
:
...
...
@@ -118,7 +118,7 @@ def view(request, short):
domain
=
"%s://%s"
%
(
request
.
scheme
,
request
.
META
.
get
(
'HTTP_HOST'
))
+
"/"
# Get the URL that is being requested
url
=
get_object_or_404
(
URL
,
short__iexact
=
short
)
url
=
get_object_or_404
(
URL
,
short__iexact
=
short
)
# Render view.html passing the specified URL and Domain to the template
return
render
(
request
,
'view.html'
,
{
...
...
@@ -142,7 +142,7 @@ def my_links(request):
domain
=
"%s://%s"
%
(
request
.
scheme
,
request
.
META
.
get
(
'HTTP_HOST'
))
+
"/"
# Grab a list of all the URL's that are currently owned by the user
urls
=
URL
.
objects
.
filter
(
owner
=
request
.
user
.
registereduser
)
urls
=
URL
.
objects
.
filter
(
owner
=
request
.
user
.
registereduser
)
# Render my_links.html passing the list of URL's and Domain to the template
return
render
(
request
,
'my_links.html'
,
{
...
...
@@ -164,7 +164,7 @@ def delete(request, short):
return
render
(
request
,
'not_registered.html'
)
# Get the URL that is going to be deleted
url
=
get_object_or_404
(
URL
,
short__iexact
=
short
)
url
=
get_object_or_404
(
URL
,
short__iexact
=
short
)
# If the RegisteredUser is the owner of the URL
if
url
.
owner
==
request
.
user
.
registereduser
:
...
...
@@ -201,8 +201,8 @@ def signup(request):
if
request
.
method
==
'POST'
:
# Now we initialize the form again but this time we have the POST
# request
signup_form
=
SignupForm
(
request
,
request
.
POST
,
instance
=
request
.
user
.
registereduser
,
initial
=
{
'full_name'
:
request
.
user
.
first_name
+
" "
+
request
.
user
.
last_name
})
signup_form
=
SignupForm
(
request
,
request
.
POST
,
instance
=
request
.
user
.
registereduser
,
initial
=
{
'full_name'
:
request
.
user
.
first_name
+
" "
+
request
.
user
.
last_name
})
# set the readonly flag again for good measure
signup_form
.
fields
[
'full_name'
].
widget
.
attrs
[
'readonly'
]
=
'readonly'
...
...
@@ -235,7 +235,7 @@ def signup(request):
######################
settings
.
EMAIL_FROM
,
[
settings
.
EMAIL_TO
],
reply_to
=
[
user_mail
]
reply_to
=
[
user_mail
]
).
send
()
# Confirmation email sent to Users
send_mail
(
...
...
@@ -275,7 +275,7 @@ def redirection(request, short):
domain
=
"%s://%s"
%
(
request
.
scheme
,
request
.
META
.
get
(
'HTTP_HOST'
))
+
"/"
# Get the URL object that relates to the requested Go link
url
=
get_object_or_404
(
URL
,
short__iexact
=
short
)
url
=
get_object_or_404
(
URL
,
short__iexact
=
short
)
# Increment our clicks by one
url
.
clicks
+=
1
...
...
@@ -299,11 +299,11 @@ def redirection(request, short):
Decorator function for views that checks that the user is logged in and is
a staff member, displaying the login page if necessary.
"""
def
staff_member_required
(
view_func
,
redirect_field_name
=
REDIRECT_FIELD_NAME
,
login_url
=
'/'
):
def
staff_member_required
(
view_func
,
redirect_field_name
=
REDIRECT_FIELD_NAME
,
login_url
=
'/'
):
return
user_passes_test
(
lambda
u
:
u
.
is_active
and
u
.
is_staff
,
login_url
=
login_url
,
redirect_field_name
=
redirect_field_name
login_url
=
login_url
,
redirect_field_name
=
redirect_field_name
)(
view_func
)
"""
...
...
@@ -320,7 +320,7 @@ def useradmin(request):
# If we're approving users
if
'_approve'
in
request
.
POST
:
for
name
in
userlist
:
toApprove
=
RegisteredUser
.
objects
.
get
(
user__username__exact
=
name
)
toApprove
=
RegisteredUser
.
objects
.
get
(
user__username__exact
=
name
)
toApprove
.
approved
=
True
toApprove
.
save
()
...
...
@@ -344,7 +344,7 @@ def useradmin(request):
# If we're denying users
elif
'_deny'
in
request
.
POST
:
for
name
in
userlist
:
toDeny
=
RegisteredUser
.
objects
.
get
(
user__username__exact
=
name
)
toDeny
=
RegisteredUser
.
objects
.
get
(
user__username__exact
=
name
)
if
settings
.
EMAIL_HOST
and
settings
.
EMAIL_PORT
:
user_mail
=
toDeny
.
user
.
username
+
settings
.
EMAIL_DOMAIN
# Send an email letting them know they are denied
...
...
@@ -369,7 +369,7 @@ def useradmin(request):
# If we're blocking users
elif
'_block'
in
request
.
POST
:
for
name
in
userlist
:
toBlock
=
RegisteredUser
.
objects
.
get
(
user__username__exact
=
name
)
toBlock
=
RegisteredUser
.
objects
.
get
(
user__username__exact
=
name
)
if
settings
.
EMAIL_HOST
and
settings
.
EMAIL_PORT
:
user_mail
=
toBlock
.
user
.
username
+
settings
.
EMAIL_DOMAIN
send_mail
(
...
...
@@ -393,7 +393,7 @@ def useradmin(request):
# If we're un-blocking users
elif
'_unblock'
in
request
.
POST
:
for
name
in
userlist
:
toUnBlock
=
RegisteredUser
.
objects
.
get
(
user__username__exact
=
name
)
toUnBlock
=
RegisteredUser
.
objects
.
get
(
user__username__exact
=
name
)
if
settings
.
EMAIL_HOST
and
settings
.
EMAIL_PORT
:
user_mail
=
toUnBlock
.
user
.
username
+
settings
.
EMAIL_DOMAIN
send_mail
(
...
...
@@ -418,7 +418,7 @@ def useradmin(request):
# If we're removing existing users
elif
'_remove'
in
request
.
POST
:
for
name
in
userlist
:
toRemove
=
RegisteredUser
.
objects
.
get
(
user__username__exact
=
name
)
toRemove
=
RegisteredUser
.
objects
.
get
(
user__username__exact
=
name
)
if
settings
.
EMAIL_HOST
and
settings
.
EMAIL_PORT
:
user_mail
=
toRemove
.
user
.
username
+
settings
.
EMAIL_DOMAIN
send_mail
(
...
...
@@ -449,5 +449,4 @@ def useradmin(request):
'need_approval'
:
need_approval
,
'current_users'
:
current_users
,
'blocked_users'
:
blocked_users
},
)
})
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