Commit 818b7d8b authored by Jean Michel Rouly's avatar Jean Michel Rouly
Browse files

Remigrated logic back into view so it works now omg

parent 4b940ea2
...@@ -2,7 +2,7 @@ from go.models import URL, RegisteredUser ...@@ -2,7 +2,7 @@ from go.models import URL, RegisteredUser
from go.forms import URLForm, SignupForm from go.forms import URLForm, SignupForm
from datetime import timedelta from datetime import timedelta
from django.conf import settings from django.conf import settings
from django.http import Http404 from django.http import Http404, HttpResponseServerError
from django.utils import timezone from django.utils import timezone
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.core.exceptions import PermissionDenied from django.core.exceptions import PermissionDenied
...@@ -93,7 +93,16 @@ def index(request): ...@@ -93,7 +93,16 @@ def index(request):
if len(short) > 0: if len(short) > 0:
url.short = short url.short = short
else: else:
url.short = URL.generate_valid_short() # If the user didn't enter a short url, generate a random
# one. However, if a random one can't be generated, return
# a 500 server error.
random_short = URL.generate_valid_short()
if random_short is None:
return HttpResponseServerError(
render(request, '500.html', {})
)
else:
url.short = random_short
# Grab the expiration field value. It's currently an unsable # Grab the expiration field value. It's currently an unsable
# string value, so we need to parse it into a datetime object # string value, so we need to parse it into a datetime object
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment