merged suff, commented out some of my own

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

diff --git a/floof/controllers/art.py b/floof/controllers/art.py
index bf928f0..0b89d98 100644 (file)
--- a/floof/controllers/art.py
+++ b/floof/controllers/art.py
@@ -1,13 +1,13 @@
 import logging
 
-from pylons import config, request, response, session, tmpl_context as c, h
+from pylons import config, request, response, session, tmpl_context as c
 from pylons.controllers.util import abort, redirect
 from pylons import url
 from floof.lib.base import BaseController, render
 
 log = logging.getLogger(__name__)
 
-from floof.lib import file_storage as storage
+from floof.lib import file_storage as storage, helpers as h
 from floof.model import Art, Rating, ArtUser
 from floof.model.art import ArtUserType
 from floof.model.comments import Discussion
@@ -26,6 +26,7 @@ from wtforms import *
 
 class ArtUploadForm(Form):
     by = TextField('Artists')
+    by_me = BooleanField('me')
     file = FileField('Upload')
     url = TextField('Link')
 
@@ -94,9 +95,17 @@ class ArtController(BaseController):
         )
         c.art.discussion = Discussion(count=0)
 
+        # <<<<<<< HEAD
+        #         if c.form.by_me and c.user not in c.form.by.data:
+        #             UserRelation(user=c.user, creator=c.user, kind="by", art=c.art)
+        # 
+        #         for artist in c.form.by.data:
+        #             UserRelation(user=artist, creator=c.user, kind="by", art=c.art)
+        # =======
         # For the moment, cheerfully assume that people are uploading their own
         # art
         ArtUser(art=c.art, user=c.user, type=ArtUserType.BY)
+        # >>>>>>> origin/master
 
 
         try: