projects
/
zzz-floof.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git@veekun.com:floof
[zzz-floof.git]
/
floof
/
model
/
art.py
diff --git
a/floof/model/art.py
b/floof/model/art.py
index
c21c74a
..
0732684
100644
(file)
--- 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
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))
class Art(Entity):
title = Field(Unicode(120))
@@
-20,6
+21,7
@@
class Art(Entity):
uploader = ManyToOne('User', required=True)
tags = OneToMany('Tag')
uploader = ManyToOne('User', required=True)
tags = OneToMany('Tag')
+ discussion = ManyToOne('Discussion')
def set_file(self, file):
self.hash = save_file("art", file)
def set_file(self, file):
self.hash = save_file("art", file)