Small fixes

This commit is contained in:
Noah 2014-06-21 02:22:35 +00:00
parent a682ea17c1
commit 3e6e51e308
2 changed files with 4 additions and 4 deletions

View File

@ -295,7 +295,7 @@ def upload_from_pc(request):
form = request.form form = request.form
count = 0 count = 0
status = None status = None
for upload in request.files.getlist("file"): for upload in reversed(request.files.getlist("file")):
count += 1 count += 1
# Make a temp filename for it. # Make a temp filename for it.
@ -553,4 +553,4 @@ def random_hash():
"""Get a short random hash to use as the base name for a photo.""" """Get a short random hash to use as the base name for a photo."""
md5 = hashlib.md5() md5 = hashlib.md5()
md5.update(str(random.randint(0, 1000000)).encode("utf-8")) md5.update(str(random.randint(0, 1000000)).encode("utf-8"))
return md5.hexdigest()[:8] return md5.hexdigest()[:8]

View File

@ -100,7 +100,7 @@ def upload():
# Good! # Good!
if is_ajax: if is_ajax:
# Was it a multiple upload? # Was it a multiple upload?
if result["multi"]: if result.get("multi"):
return ajax_response(True, url_for(".album_index", name=album)) return ajax_response(True, url_for(".album_index", name=album))
else: else:
return ajax_response(True, url_for(".crop", photo=result["photo"])) return ajax_response(True, url_for(".crop", photo=result["photo"]))
@ -262,4 +262,4 @@ def arrange_photos(album):
g.info["album"] = album g.info["album"] = album
g.info["photos"] = photos g.info["photos"] = photos
return template("photos/arrange_photos.html") return template("photos/arrange_photos.html")