Fix search to do an AND of tags, not OR.

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

diff --git a/floof/controllers/art.py b/floof/controllers/art.py
index dd06f12..8d40321 100644 (file)
--- a/floof/controllers/art.py
+++ b/floof/controllers/art.py
@@ -1,15 +1,14 @@
 import logging
 
-from pylons import request, response, session, tmpl_context as c, config
+from pylons import request, response, session, tmpl_context as c
 from pylons.controllers.util import abort, redirect_to
 
 from floof.lib.base import BaseController, render
 
 log = logging.getLogger(__name__)
 
-
-
-from floof.lib.file_storage import save_file
+import elixir
+from floof.model.art import Art
 
 class ArtController(BaseController):
 
@@ -20,10 +19,20 @@ class ArtController(BaseController):
     def new(self):
         """ New Art! """
         return render("/art/new.mako")
-        
-        
+
+
     def upload(self):
-        file = request.POST['file']
-        root = config['app_conf']['art_root']
-        save_file(root, file)
+        print "PARAMS", request.params
+        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)
+        return render("/art/show.mako")
+
+    def tag(self, id):
+        art = Art.get(id)
+        art.add_tags(request.params["tags"], c.user)
+        elixir.session.commit()
+        redirect_to(action="show", id=art.id)
\ No newline at end of file