trying to catch edgecase bugs
parent
36caf80a34
commit
e2da724551
14
app.py
14
app.py
|
@ -9,6 +9,7 @@ from deck import bp as deck_bp
|
|||
from menu import bp as menu_bp
|
||||
from upload import bp as upload_bp
|
||||
from share import share
|
||||
from matches import bp as matches_bp
|
||||
|
||||
from create_db import Card, Deck
|
||||
from config import CONFIG
|
||||
|
@ -57,6 +58,10 @@ def create_app(test_config=None):
|
|||
deck_query = dbsession.query(Deck).filter(Deck.owner_id == user_id)
|
||||
deck_object = deck_query.filter(Deck.completed == False).first()
|
||||
# @TODO: ce deck, ne obstaja, kaj naj zaj jas?
|
||||
if len(deck_object.cards_by_id.split(",")) == 0:
|
||||
deck_query.filter(Deck)
|
||||
return index()
|
||||
|
||||
|
||||
deck_id = deck_object.id
|
||||
|
||||
|
@ -116,7 +121,9 @@ def create_app(test_config=None):
|
|||
show_card = dbsession.query(Card).get(show_card_id)
|
||||
|
||||
if not show_card:
|
||||
raise Exception("Ne najdem naslednje karte")
|
||||
print("SHOWWWWWWW")
|
||||
return render_template("error/no_cards_in_collection.html")
|
||||
#raise Exception("Ne najdem naslednje karte")
|
||||
|
||||
# Prikaži obrazec
|
||||
return render_template("deck/index.html", username=username, card=show_card)
|
||||
|
@ -124,10 +131,6 @@ def create_app(test_config=None):
|
|||
|
||||
@app.route("/share_button", methods=["GET", "POST"])
|
||||
def share_button():
|
||||
userid = session["user_id"]
|
||||
username = session["username"]
|
||||
card_number = session["card_number"]
|
||||
|
||||
print("share!!!")
|
||||
return redirect(url_for("deck"))
|
||||
|
||||
|
@ -147,6 +150,7 @@ def create_app(test_config=None):
|
|||
app.register_blueprint(deck_bp)
|
||||
app.register_blueprint(menu_bp)
|
||||
app.register_blueprint(upload_bp)
|
||||
app.register_blueprint(matches_bp)
|
||||
app.add_url_rule('/', endpoint='index')
|
||||
|
||||
return app
|
||||
|
|
Loading…
Reference in New Issue