saved searches is going awesome. Partial work on adding them as galleries

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

diff --git a/floof/controllers/art.py b/floof/controllers/art.py
index 99027aa..6c5e454 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


@@ -19,8 +19,8 @@ class ArtController(BaseController):
     def new(self):
         """ New Art! """
         return render("/art/new.mako")
     def new(self):
         """ New Art! """
         return render("/art/new.mako")

-        
-        
+
+

     def upload(self):
         print "PARAMS", request.params
         Art(uploaded_by=c.user, **request.params)
     def upload(self):
         print "PARAMS", request.params
         Art(uploaded_by=c.user, **request.params)


@@ -28,19 +28,21 @@ class ArtController(BaseController):
         redirect_to(controller="main", action="index")
 
     def show(self, id):
         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

     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["tags"], c.user)

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

-        redirect_to(action="show", id=art.id)
+        redirect_to(action="show", 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(action="show", id=c.art.id)