merged in my branch 'resources', which is not aptly named anymore since it no longer...

diff --git a/floof/controllers/art.py b/floof/controllers/art.py
index 8dfc487..5186daa 100644 (file)
--- a/floof/controllers/art.py
+++ b/floof/controllers/art.py
@@ -50,13 +50,7 @@ class ArtController(BaseController):
             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)

diff --git a/floof/controllers/tag.py b/floof/controllers/tag.py
index c00eaf6..874e605 100644 (file)
--- a/floof/controllers/tag.py
+++ b/floof/controllers/tag.py
@@ -23,7 +23,7 @@ class TagController(BaseController):
     # TODO: login required
     def create(self, art_id):
         c.art = h.get_object_or_404(Art, id=art_id)
-        c.art.add_tags(request.params["tags"], c.user)
+        c.art.add_tags(request.params.get("tags",""), c.user)
         elixir.session.commit()
         redirect(url('show_art', id=c.art.id))