merged. Oh no, we have two different user relationship models. Mine's in relations...

[zzz-floof.git] / floof / controllers / search.py

diff --git a/floof/controllers/search.py b/floof/controllers/search.py
index 57ff4d2..f87ddae 100644 (file)
--- a/floof/controllers/search.py
+++ b/floof/controllers/search.py
@@ -9,8 +9,8 @@ from floof.lib.search import do_search
 
 log = logging.getLogger(__name__)
 
 
 log = logging.getLogger(__name__)
 

-from floof.model.art import Art, Tag, TagText
-from floof.model.search import SavedSearch, GalleryWidget
+from floof.model import Art, Tag, TagText
+from floof.model import SavedSearch, GalleryWidget

 import elixir
 
 class SearchController(BaseController):
 import elixir
 
 class SearchController(BaseController):


@@ -18,11 +18,11 @@ class SearchController(BaseController):
     def index(self):
         if request.params.get('button') == 'Save':
             return self.save()
     def index(self):
         if request.params.get('button') == 'Save':
             return self.save()

-        
+

         c.query = request.params.get('query', '')
         c.artwork = do_search(c.query)
         return render('/index.mako')
         c.query = request.params.get('query', '')
         c.artwork = do_search(c.query)
         return render('/index.mako')

-        
+

     # TODO: login required
     def save(self):
         c.query = request.params.get('query', '')
     # TODO: login required
     def save(self):
         c.query = request.params.get('query', '')


@@ -30,19 +30,18 @@ class SearchController(BaseController):
         elixir.session.commit()
         redirect(url('saved_searches'))
         # TODO: do something better than this.
         elixir.session.commit()
         redirect(url('saved_searches'))
         # TODO: do something better than this.

-        
-    
+
+

     # TODO: login required
     def list(self):
         c.searches = c.user.searches
         return render('/searches.mako')
     # TODO: login required
     def list(self):
         c.searches = c.user.searches
         return render('/searches.mako')

-    
+

     # TODO: login required
     def display(self, id):
         c.search = h.get_object_or_404(SavedSearch, id=id)
         c.gallery = GalleryWidget(search=c.search, page=c.user.primary_page)
         elixir.session.commit()
         redirect(url(controller="users", action="view", name=c.user.name))
     # TODO: login required
     def display(self, id):
         c.search = h.get_object_or_404(SavedSearch, id=id)
         c.gallery = GalleryWidget(search=c.search, page=c.user.primary_page)
         elixir.session.commit()
         redirect(url(controller="users", action="view", name=c.user.name))

-        
-        
-        
\ No newline at end of file
+
+