From: Nick Retallack <nickretallack@gmil.com>
Date: Wed, 7 Oct 2009 06:25:16 +0000 (-0700)
Subject: merged in my branch 'resources', which is not aptly named anymore since it no longer... 
X-Git-Url: http://git.veekun.com/zzz-floof.git/commitdiff_plain/366dedf71b3cdd775251c7cea4b1519b44b37164?hp=69d5189cc4fb2ca63418a0741bf744cf5fee8bc9

merged in my branch 'resources', which is not aptly named anymore since it no longer uses resources at all.  Just named routes.  It has new features like galleries though so it's cool.
---

diff --git a/floof/controllers/art.py b/floof/controllers/art.py
index 8dfc487..5186daa 100644
--- 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
--- 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))