X-Git-Url: http://git.veekun.com/zzz-floof.git/blobdiff_plain/ee952326340b2251b42db34f4823b0495338be86..482924ec2b85600ccb905a3ee53b1ca6df419ab6:/floof/model/art.py?ds=inline

diff --git a/floof/model/art.py b/floof/model/art.py
index 1bde59b..0732684 100644
--- a/floof/model/art.py
+++ b/floof/model/art.py
@@ -12,6 +12,7 @@ from pylons import config
 
 from floof.lib.file_storage import get_path, save_file
 from floof.lib.dbhelpers import find_or_create, update_or_create
+import floof.model.comments
 
 class Art(Entity):
     title = Field(Unicode(120))
@@ -20,16 +21,7 @@ class Art(Entity):
 
     uploader = ManyToOne('User', required=True)
     tags = OneToMany('Tag')
-
-    # def __init__(self, **kwargs):
-    #     # I wanted to check for the existence of the file, but...
-    #     # for some reason this FieldStorage object always conditions as falsey.
-    #     # self.hash = save_file("art", kwargs.pop('file'))
-    #     super(Art, self).__init__(**kwargs)
-    #     # this is what super is doing, pretty much.
-    #     # for key, value in kwargs.items():
-    #     #     setattr(self, key, value)
-    # left for posterity.
+    discussion = ManyToOne('Discussion')
 
     def set_file(self, file):
         self.hash = save_file("art", file)
@@ -83,15 +75,6 @@ class Tag(Entity):
     tagger = ManyToOne('User', ondelete='cascade')
     tagtext = ManyToOne('TagText')
 
-    # this text setter is no longer useful since I changed the way Art#add_tags works
-    # but I'll leave it in here just for several minutes nostalgia.
-    # def set_text(self, text):
-    #     self.tagtext = TagText.get_by(text=text)
-    #     if not self.tagtext:
-    #         self.tagtext = TagText(text=text)
-    #
-    # text = property(lambda self: self.tagtext.text, set_text)
-
     def __unicode__(self):
         if not self.tagtext:
             return "(broken)"
@@ -111,12 +94,8 @@ class Rating(Entity):
     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()))
\ No newline at end of file
+Rating.reverse_options = dict (zip(Rating.options.values(), Rating.options.keys()))