Fixed Adityas request of pw reset error log.

graphs/static/graphs/js/reset.js

@@ -24,6 +24,7 @@ $(document).ready(function() {
 			}, function(data) {
 
 				if (data.Error) {
+					console.log(data);
 					return alert(data.Error);
 				} else {
 					alert("Password Updated!");

graphs/util/db.py

@@ -191,12 +191,13 @@ def resetPassword(username, password):
 		# Hash password
 		password = bcrypt.hashpw(password, bcrypt.gensalt())
 		# Update the password for the user (after encryption of course)
-		user_to_reset_pw_for = db_session.query(models.User).filter(models.User.user_id == username).one()
+		user_to_reset_pw_for = db_session.query(models.User).filter(models.User.user_id == username).first()
 		user_to_reset_pw_for.password = password
 
 		# Remove user's account from password_reset table
-		delete_from_password_reset = db_session.query(models.PasswordReset).filter(models.PasswordReset.user_id == username).one()
-		db_session.delete(delete_from_password_reset)
+		delete_from_password_reset = db_session.query(models.PasswordReset).filter(models.PasswordReset.user_id == username).all()
+		for acct in delete_from_password_reset:
+			db_session.delete(acct)
 		db_session.commit()
 		db_session.close()
 		return "Password updated successfully"

graphs/views.py

@@ -884,7 +884,6 @@ def resetLink(request):
             return render(request, 'graphs/error.html', context)
 
         context = {"email": email, "url": URL_PATH}
-
         return render(request, 'graphs/reset.html', context)
 
 def resetPassword(request):
@@ -899,6 +898,7 @@ def resetPassword(request):
 
     '''
     resetInfo = db.resetPassword(request.POST['email'], request.POST['password'])
+    print resetInfo
 
     if resetInfo == None:
         return HttpResponse(json.dumps(db.throwError(500, "Password Update not successful!")), content_type="application/json");