From: Nick Retallack <nickretallack@gmil.com>
Date: Sat, 24 Oct 2009 05:00:00 +0000 (-0700)
Subject: merged in comments
X-Git-Url: http://git.veekun.com/zzz-floof.git/commitdiff_plain/f267b2f2841d407dcdf9c3c0f5406f8c10403ccb

merged in comments
---

f267b2f2841d407dcdf9c3c0f5406f8c10403ccb
diff --cc floof/model/art.py
index 544a830,0732684..8b328d8
--- a/floof/model/art.py
+++ b/floof/model/art.py
@@@ -110,25 -93,9 +93,19 @@@ class Rating(Entity)
      art = ManyToOne('Art', ondelete='cascade')
      rater = ManyToOne('User', ondelete='cascade')
      score = Field(Integer)
-     
-     # @score.setter
-     # def score(self, value):    
-         
+ 
      options = {-1:"sucks", 0:"undecided", 1:"good", 2:"great"}
      default = 0
-     # options = ["sucks","neutral","good","great"]
-     
  
 -
  Rating.reverse_options = dict (zip(Rating.options.values(), Rating.options.keys()))
 +
 +
 +
- 
 +class UserRelation(Entity):
 +    related = ManyToOne("User")
 +    art = ManyToOne("Art")
 +    type = Field(String) # by for of
 +    
 +    
 +# class CharacterRelation(Entity):
- #     pass
++#     pass
diff --cc floof/model/search.py
index a413eb6,01d45a2..2296491
--- a/floof/model/search.py
+++ b/floof/model/search.py
@@@ -6,11 -6,10 +6,11 @@@ from floof.lib.search import do_searc
  class SavedSearch(Entity):
      string = Field(Unicode) # I tried calling this query, but it broke elixir
      author = ManyToOne('User')
 +    fork = ManyToOne("SavedSearch")
-     
+ 
      def __unicode__(self):
          return self.string
-         
+ 
      @property
      def results(self):
          return do_search(self.string)
diff --cc floof/model/users.py
index 2775ab7,e2afd17..c38197c
--- a/floof/model/users.py
+++ b/floof/model/users.py
@@@ -45,18 -45,12 +45,17 @@@ class UserPage(Entity)
      This is so that they can keep some nice themed pages lying around for special occasions.
      Page templates that provide familiar interfaces will also be UserPage records.  Users will
      see a panel full of them, and they can choose to clone those template pages to their own page list.
 -    If more than one is set to visible, there would be tabs.
 -
 -     """
 -
 +    If more than one is set to visible, there would be tabs.  The primary page is indicated in the user model.
-     
 +    """
 +    
      owner = ManyToOne('User', inverse="pages")
      title = Field(String)
-     
+ 
      visible = Field(Boolean)
 -    galleries = OneToMany('GalleryWidget')
 +    galleries = OneToMany('GalleryWidget')
 +    
 +    
 +    
 +    
 +# class ArtRelation(Entity):
 +#