X-Git-Url: http://git.veekun.com/zzz-floof.git/blobdiff_plain/efdbb22873232827398ba7605f8b35c605c043e9..HEAD:/floof/controllers/relation.py diff --git a/floof/controllers/relation.py b/floof/controllers/relation.py index 48e7a46..330559e 100644 --- a/floof/controllers/relation.py +++ b/floof/controllers/relation.py @@ -1,13 +1,14 @@ import logging -from pylons import request, response, session, tmpl_context as c, h, url +from pylons import request, response, session, tmpl_context as c, url from pylons.controllers.util import abort, redirect +from floof.lib import helpers as h from floof.lib.base import BaseController, render log = logging.getLogger(__name__) -from floof.model import Art, UserRelation +from floof.model import Art, UserRelationship from floof.model.users import User import elixir @@ -20,11 +21,11 @@ class RelationController(BaseController): user = h.get_object_or_404(User, name=request.params['username']) ## TODO: actually, this should act like a form validation. - prior_relation = UserRelation.get_by(art=art, user=user) + prior_relation = UserRelationship.get_by(art=art, user=user) if prior_relation: abort(404) ## should be a validation error - relation = UserRelation(user=user, kind=kind, art=art, creator=c.user) + relation = UserRelationship(user=user, kind=kind, art=art, creator=c.user) elixir.session.commit() redirect(url('show_art', id=art_id))