attempting to fix things that are broken. Comitting so I can get the newer version.

diff --git a/floof/lib/tags.py b/floof/lib/tags.py
index 6186048..9bfdf04 100644 (file)
--- a/floof/lib/tags.py
+++ b/floof/lib/tags.py
@@ -1,5 +1,5 @@
 from floof.model import Art, ArtUser, ArtUserType, Tag, TagText, User
 from floof.model import Art, ArtUser, ArtUserType, Tag, TagText, User

-
+import elixir

 from dbhelpers import find_or_create
 import re
 def parse(search_string):
 from dbhelpers import find_or_create
 import re
 def parse(search_string):

diff --git a/floof/model/search.py b/floof/model/search.py
index 37f2d5f..f03de51 100644 (file)
--- a/floof/model/search.py
+++ b/floof/model/search.py
@@ -24,7 +24,7 @@ class GalleryWidget(Entity):
 
     @property
     def string(self):
 
     @property
     def string(self):

-        return self.search
+        return self.search.string

 
     @string.setter
     def string(self, value):
 
     @string.setter
     def string(self, value):

diff --git a/floof/templates/art/show.mako b/floof/templates/art/show.mako
index 9356447..3ea3849 100644 (file)
--- a/floof/templates/art/show.mako
+++ b/floof/templates/art/show.mako
@@ -38,7 +38,7 @@ ${h.end_form()}
                                ('Recipient', c.art.recipients), \
                                ('Participant', c.art.participants)):
 % for user in relations:
                                ('Recipient', c.art.recipients), \
                                ('Participant', c.art.participants)):
 % for user in relations:

-<li>${label}: ${user.name}
+<li>${label}: <a href="${h.url('user_page', name=user.name)}">${user.name}</a>

 % endfor
 % endfor
 </ul>
 % endfor
 % endfor
 </ul>

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

-${macros.thumbs(parse(gallery.tags.string))}
+${macros.thumbs(parse(gallery.string))}

 % endfor
 % endfor