projects
/
zzz-floof.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Super-simple comment display.
[zzz-floof.git]
/
floof
/
model
/
art.py
diff --git
a/floof/model/art.py
b/floof/model/art.py
index
c3fba3a
..
451383b
100644
(file)
--- a/
floof/model/art.py
+++ b/
floof/model/art.py
@@
-12,14
+12,16
@@
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
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))
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')
tags = OneToMany('Tag')
+ discussion = ManyToOne('Discussion')
# def __init__(self, **kwargs):
# # I wanted to check for the existence of the file, but...
# def __init__(self, **kwargs):
# # I wanted to check for the existence of the file, but...
@@
-33,6
+35,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)
@@
-51,7
+54,7
@@
class Art(Entity):
if tag:
elixir.session.delete(tag)
if tag:
elixir.session.delete(tag)
- else:
+ else:
if len(text) > 50:
raise "Long Tag!" # can we handle this more gracefully?
# sqlite seems happy to store strings much longer than the supplied limit...
if len(text) > 50:
raise "Long Tag!" # can we handle this more gracefully?
# sqlite seems happy to store strings much longer than the supplied limit...
@@
-65,7
+68,7
@@
class Art(Entity):
def rate(self, score, user):
return update_or_create(Rating, {"rater":user, "art":self}, {"score":score})
def rate(self, score, user):
return update_or_create(Rating, {"rater":user, "art":self}, {"score":score})
-
+
def user_score(self, user):
rating = Rating.get_by(rater=user, art=self)
if rating:
def user_score(self, user):
rating = Rating.get_by(rater=user, art=self)
if rating:
@@
-103,16
+106,19
@@
class TagText(Entity):
def __unicode__(self):
return self.text
def __unicode__(self):
return self.text
-
+
class Rating(Entity):
art = ManyToOne('Art', ondelete='cascade')
rater = ManyToOne('User', ondelete='cascade')
score = Field(Integer)
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"]
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()))