X-Git-Url: http://git.veekun.com/zzz-floof.git/blobdiff_plain/366dedf71b3cdd775251c7cea4b1519b44b37164..5a8f3bd86e5fbcdd1ae077b15c17a66de14c091e:/floof/controllers/art.py?ds=sidebyside

diff --git a/floof/controllers/art.py b/floof/controllers/art.py
index 5186daa..5216da7 100644
--- a/floof/controllers/art.py
+++ b/floof/controllers/art.py
@@ -8,7 +8,9 @@ from floof.lib.base import BaseController, render
 log = logging.getLogger(__name__)
 
 import elixir
-from floof.model.art import Art, Rating
+from floof.model.users import User
+from floof.model.art import Art, Rating, UserRelation
+from floof.model.comments import Discussion
 
 from sqlalchemy.exceptions import IntegrityError
 
@@ -20,17 +22,25 @@ class ArtController(BaseController):
         if id:
             c.art = h.get_object_or_404(Art, id=id)
 
-    # def index():
-    #     c.artwork = Art.query.order_by(Art.id.desc()).all()
-    #     return render
-
     def new(self):
         """ New Art! """
         return render("/art/new.mako")
 
     # TODO: login required
     def create(self):
+        # if 'file' not in request.params or not request.params['file']:
+        #     return "Validation Error: Needs a File"
+
+
         c.art = Art(uploader=c.user, **request.params)
+        c.art.discussion = Discussion(count=0)
+        
+
+        artist = User.get_by(name=request.params['artist'])
+        if not artist:
+            return "Validation Error: Artist not found"
+
+        relation = UserRelation(user=artist, kind="by", creator=c.user, art=c.art)
 
         try:
             elixir.session.commit()
@@ -49,7 +59,7 @@ class ArtController(BaseController):
         if c.user:
             c.your_score = c.art.user_score(c.user)
         return render("/art/show.mako")
-        
+
 
     # TODO: login required
     def rate(self, id):
@@ -59,8 +69,8 @@ class ArtController(BaseController):
             score = int(score)
         else:
             score = Rating.reverse_options.get(score)
-        
+
         c.art.rate(score, c.user)
         elixir.session.commit()
-            
+
         redirect(url('show_art', id=c.art.id))