merged conflicting stuff. Added 'me' tag

diff --git a/floof/lib/tags.py b/floof/lib/tags.py
index 9bfdf04..d2adafc 100644 (file)
--- a/floof/lib/tags.py
+++ b/floof/lib/tags.py
@@ -2,6 +2,9 @@ from floof.model import Art, ArtUser, ArtUserType, Tag, TagText, User
 import elixir
 from dbhelpers import find_or_create
 import re
+
+from pylons import c
+
 def parse(search_string):
     """Parses a search query, and returns a query object on Art.
 
@@ -25,6 +28,8 @@ def parse(search_string):
             # This is a special tag; at the moment, by/for/of to indicate
             # related users
             prefix, tag = tag.split(':', 1)
+            if tag == 'me':
+                tag = c.user.name
 
             # XXX what to do if this fails?  abort?  return empty query?
             target_user = User.get_by(name=tag)

diff --git a/floof/templates/users/view.mako b/floof/templates/users/view.mako
index 5c2e8e6..3bff21a 100644 (file)
--- a/floof/templates/users/view.mako
+++ b/floof/templates/users/view.mako
@@ -21,8 +21,8 @@ ${h.form(url(controller='user_settings', action='rel_toggle', name=c.user.name.l
     % endif
 % endif
 
-<%! from floof.lib.search import parse %>
+<%! from floof.lib.tags import parse %>
 % for gallery in c.this_user.primary_page.galleries:
 <h2>${gallery.string}</h2>
-${macros.thumbs(parse(gallery.string))}
+${macros.thumbs(parse(gallery.search.string))}
 % endfor