Cleaned up websetup a little.

[zzz-floof.git] / floof / lib / tags.py

diff --git a/floof/lib/tags.py b/floof/lib/tags.py
index 2a9beaf..0984982 100644 (file)
--- a/floof/lib/tags.py
+++ b/floof/lib/tags.py
@@ -100,7 +100,7 @@ def add_tags(art, tag_string, adding_user, me):
         # Do work!
         if prefix:
             if tag_text == 'me':
-                target_user = c.user
+                target_user = me
             else:
                 target_user = User.get_by(name=tag_text)
 
@@ -118,20 +118,20 @@ def add_tags(art, tag_string, adding_user, me):
 
             else:
                 # XXX this will die for nonassociations
-                user_assoc = ArtUser.get_by(art=art, **user_assoc_data)
+                user_assoc = ArtUser.get_by(**user_assoc_data)
                 user_assoc.delete()
 
         else:
             # Regular tag
             if add:
                 tag = find_or_create(TagText, text=tag_text)
-                find_or_create(Tag, art=art, tagger=user, tagtext=tag)
+                find_or_create(Tag, art=art, tagger=adding_user, tagtext=tag)
 
             else:
                 tag = TagText.get_by(text=tag_text)
                 if tag:
                     # XXX this will die
-                    tag_assoc = Tag.get_by(art=art, tagger=user, tagtext=tag)
+                    tag_assoc = Tag.get_by(art=art, tagger=adding_user, tagtext=tag)
                     tag_assoc.delete()
 
     elixir.session.commit()