fixed empty tag form submission

[zzz-floof.git] / floof / controllers / art.py

diff --git a/floof/controllers/art.py b/floof/controllers/art.py
index 7378f7a..a0aecd7 100644 (file)
--- a/floof/controllers/art.py
+++ b/floof/controllers/art.py
@@ -1,6 +1,6 @@
 import logging
 
 import logging
 

-from pylons import request, response, session, tmpl_context as c
+from pylons import request, response, session, tmpl_context as c, h

 from pylons.controllers.util import abort, redirect_to
 
 from floof.lib.base import BaseController, render
 from pylons.controllers.util import abort, redirect_to
 
 from floof.lib.base import BaseController, render


@@ -11,6 +11,11 @@ import elixir
 from floof.model.art import Art
 
 class ArtController(BaseController):
 from floof.model.art import Art
 
 class ArtController(BaseController):

+    def __before__(self, id=None):
+        super(ArtController, self).__before__()
+        # Awesome refactoring!
+        if id:
+            c.art = h.get_object_or_404(Art, id=id)

 
     # def index():
     #     c.artwork = Art.query.order_by(Art.id.desc()).all()
 
     # def index():
     #     c.artwork = Art.query.order_by(Art.id.desc()).all()


@@ -20,27 +25,29 @@ class ArtController(BaseController):
         """ New Art! """
         return render("/art/new.mako")
 
         """ New Art! """
         return render("/art/new.mako")
 

-
+    # TODO: login required

     def upload(self):
     def upload(self):

-        print "PARAMS", request.params

         Art(uploaded_by=c.user, **request.params)
         elixir.session.commit()
         redirect_to(controller="main", action="index")
 
     def show(self, id):
         Art(uploaded_by=c.user, **request.params)
         elixir.session.commit()
         redirect_to(controller="main", action="index")
 
     def show(self, id):

-        c.art = Art.get(id)
-        c.your_score = c.art.user_score(c.user)
+        # c.art = h.get_object_or_404(Art, id=id)
+        if c.user:
+            c.your_score = c.art.user_score(c.user)

         return render("/art/show.mako")
         
         return render("/art/show.mako")
         

-    # should force logged in on these things
+    # TODO: login required
+    # also, require post

     def tag(self, id):
     def tag(self, id):

-        art = Art.get(id)
-        art.add_tags(request.params["tags"], c.user)
+        # c.art = h.get_object_or_404(Art, id=id)
+        c.art.add_tags(request.params.get("tags",""), c.user)

         elixir.session.commit()
         elixir.session.commit()

-        redirect_to(action="show", id=art.id)
+        redirect_to('show_art', id=c.art.id)

     
     

+    # TODO: login required

     def rate(self, id):
     def rate(self, id):

-        art = Art.get(id)
-        art.rate(request.params["score"], c.user)
+        # c.art = h.get_object_or_404(Art, id=id)
+        c.art.rate(request.params["score"], c.user)

         elixir.session.commit()
         elixir.session.commit()

-        redirect_to(action="show", id=art.id)
+        redirect_to('show_art', id=c.art.id)