add artist when posting

diff --git a/floof/controllers/art.py b/floof/controllers/art.py
index d598292..5216da7 100644 (file)
--- a/floof/controllers/art.py
+++ b/floof/controllers/art.py
@@ -8,7 +8,8 @@ from floof.lib.base import BaseController, render
 log = logging.getLogger(__name__)
 
 import elixir
 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
 from floof.model.comments import Discussion
 
 from sqlalchemy.exceptions import IntegrityError


@@ -27,8 +28,19 @@ class ArtController(BaseController):
 
     # TODO: login required
     def create(self):
 
     # 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)
         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()
 
         try:
             elixir.session.commit()

diff --git a/floof/model/art.py b/floof/model/art.py
index e9d4e44..ff8035a 100644 (file)
--- a/floof/model/art.py
+++ b/floof/model/art.py
@@ -119,7 +119,6 @@ class UserRelation(Entity):
         super(UserRelation, self).__init__(**kwargs)
         assert self.user and self.art and self.kind and self.creator
         
         super(UserRelation, self).__init__(**kwargs)
         assert self.user and self.art and self.kind and self.creator
         

-        

         if self.creator == self.user:
             self.confirmed_by_related_user = True
         # TODO: implement authorities
         if self.creator == self.user:
             self.confirmed_by_related_user = True
         # TODO: implement authorities

diff --git a/floof/templates/art/new.mako b/floof/templates/art/new.mako
index 3eda527..97cac9e 100644 (file)
--- a/floof/templates/art/new.mako
+++ b/floof/templates/art/new.mako
@@ -4,6 +4,7 @@
 <p>Now: Upload a file.  Later: Supply a link?  Not exclusive to uploading.</p>
 
 ${h.form(h.url('create_art'), multipart=True)}
 <p>Now: Upload a file.  Later: Supply a link?  Not exclusive to uploading.</p>
 
 ${h.form(h.url('create_art'), multipart=True)}

+Artist: ${h.text('artist')}

 ${h.file('file')}
 ${h.submit(None, 'Upload!')}
 ${h.end_form()}
 ${h.file('file')}
 ${h.submit(None, 'Upload!')}
 ${h.end_form()}