X-Git-Url: http://git.veekun.com/zzz-floof.git/blobdiff_plain/b07336c562d537ea3407d6a1c9fcb280dae7f514..1dfae8eecba58adb311514ce7f284ed610834d6c:/floof/controllers/art.py?ds=sidebyside diff --git a/floof/controllers/art.py b/floof/controllers/art.py index ee1e4ad..7c371ed 100644 --- a/floof/controllers/art.py +++ b/floof/controllers/art.py @@ -1,13 +1,13 @@ import logging -from pylons import config, request, response, session, tmpl_context as c, h +from pylons import config, request, response, session, tmpl_context as c from pylons.controllers.util import abort, redirect from pylons import url from floof.lib.base import BaseController, render log = logging.getLogger(__name__) -from floof.lib import file_storage as storage +from floof.lib import file_storage as storage, helpers as h from floof.model import Art, Rating, ArtUser from floof.model.art import ArtUserType from floof.model.comments import Discussion @@ -18,7 +18,6 @@ import elixir import os.path import PIL import PIL.Image -from sqlalchemy import func from sqlalchemy.exceptions import IntegrityError from sqlalchemy.orm.exc import NoResultFound from wtforms.validators import ValidationError @@ -139,8 +138,7 @@ class ArtController(BaseController): def watchstream(self, name): """Watchstream for a certain user.""" try: - c.watching_user = User.query.filter(func.lower(User.name) == name) \ - .one() + c.watching_user = User.get_by(name=name) except NoResultFound: abort(404)