merged in my branch 'resources', which is not aptly named anymore since it no longer...

[zzz-floof.git] / floof / model / art.py

diff --git a/floof/model/art.py b/floof/model/art.py
index c3fba3a..b709610 100644 (file)
--- a/floof/model/art.py
+++ b/floof/model/art.py
@@ -16,9 +16,9 @@ from floof.lib.dbhelpers import find_or_create, update_or_create
 class Art(Entity):
     title = Field(Unicode(120))
     original_filename = Field(Unicode(120))
 class Art(Entity):
     title = Field(Unicode(120))
     original_filename = Field(Unicode(120))

-    hash = Field(String)
+    hash = Field(String, unique=True, required=True)

 
 

-    uploader = ManyToOne('User')
+    uploader = ManyToOne('User', required=True)

     tags = OneToMany('Tag')
 
     # def __init__(self, **kwargs):
     tags = OneToMany('Tag')
 
     # def __init__(self, **kwargs):


@@ -33,6 +33,7 @@ class Art(Entity):
 
     def set_file(self, file):
         self.hash = save_file("art", file)
 
     def set_file(self, file):
         self.hash = save_file("art", file)

+        self.original_filename = file.filename

 
     file = property(get_path, set_file)
 
 
     file = property(get_path, set_file)
 


@@ -109,6 +110,9 @@ class Rating(Entity):
     art = ManyToOne('Art', ondelete='cascade')
     rater = ManyToOne('User', ondelete='cascade')
     score = Field(Integer)
     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 = {-1:"sucks", 0:"undecided", 1:"good", 2:"great"}
     default = 0