projects
/
zzz-floof.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'comments'
[zzz-floof.git]
/
floof
/
controllers
/
art.py
diff --git
a/floof/controllers/art.py
b/floof/controllers/art.py
index
8dfc487
..
d598292
100644
(file)
--- a/
floof/controllers/art.py
+++ b/
floof/controllers/art.py
@@
-9,6
+9,7
@@
log = logging.getLogger(__name__)
import elixir
from floof.model.art import Art, Rating
import elixir
from floof.model.art import Art, Rating
+from floof.model.comments import Discussion
from sqlalchemy.exceptions import IntegrityError
from sqlalchemy.exceptions import IntegrityError
@@
-20,10
+21,6
@@
class ArtController(BaseController):
if id:
c.art = h.get_object_or_404(Art, id=id)
if id:
c.art = h.get_object_or_404(Art, id=id)
- # def index():
- # c.artwork = Art.query.order_by(Art.id.desc()).all()
- # return render
-
def new(self):
""" New Art! """
return render("/art/new.mako")
def new(self):
""" New Art! """
return render("/art/new.mako")
@@
-31,6
+28,7
@@
class ArtController(BaseController):
# TODO: login required
def create(self):
c.art = Art(uploader=c.user, **request.params)
# TODO: login required
def create(self):
c.art = Art(uploader=c.user, **request.params)
+ c.art.discussion = Discussion(count=0)
try:
elixir.session.commit()
try:
elixir.session.commit()
@@
-49,14
+47,8
@@
class ArtController(BaseController):
if c.user:
c.your_score = c.art.user_score(c.user)
return render("/art/show.mako")
if c.user:
c.your_score = c.art.user_score(c.user)
return render("/art/show.mako")
-
- # # TODO: login required
- # def tag(self, id):
- # # c.art = h.get_object_or_404(Art, id=id)
- # c.art.add_tags(request.params["tags"], c.user)
- # elixir.session.commit()
- # redirect_to('show_art', id=c.art.id)
- #
+
+
# TODO: login required
def rate(self, id):
# c.art = h.get_object_or_404(Art, id=id)
# TODO: login required
def rate(self, id):
# c.art = h.get_object_or_404(Art, id=id)
@@
-65,8
+57,8
@@
class ArtController(BaseController):
score = int(score)
else:
score = Rating.reverse_options.get(score)
score = int(score)
else:
score = Rating.reverse_options.get(score)
-
+
c.art.rate(score, c.user)
elixir.session.commit()
c.art.rate(score, c.user)
elixir.session.commit()
-
+
redirect(url('show_art', id=c.art.id))
redirect(url('show_art', id=c.art.id))