From 36dba08534b4309de0e0746784e2a6c5bb854030 Mon Sep 17 00:00:00 2001 From: Nick Retallack Date: Sun, 6 Dec 2009 18:18:16 -0800 Subject: [PATCH] attempting to fix things that are broken. Comitting so I can get the newer version. --- floof/lib/tags.py | 2 +- floof/model/search.py | 2 +- floof/templates/art/show.mako | 2 +- floof/templates/users/view.mako | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/floof/lib/tags.py b/floof/lib/tags.py index 6186048..9bfdf04 100644 --- a/floof/lib/tags.py +++ b/floof/lib/tags.py @@ -1,5 +1,5 @@ from floof.model import Art, ArtUser, ArtUserType, Tag, TagText, User - +import elixir 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 --- a/floof/model/search.py +++ b/floof/model/search.py @@ -24,7 +24,7 @@ class GalleryWidget(Entity): @property def string(self): - return self.search + return self.search.string @string.setter def string(self, value): diff --git a/floof/templates/art/show.mako b/floof/templates/art/show.mako index 9356447..3ea3849 100644 --- 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: -
  • ${label}: ${user.name} +
  • ${label}: ${user.name} % endfor % endfor diff --git a/floof/templates/users/view.mako b/floof/templates/users/view.mako index eb24b2d..5c2e8e6 100644 --- 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:

    ${gallery.string}

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