+ 'confirm' section for confirmation dialogues

+ implemented delete functionality
* fixed several instances of 'must be an instance of unicode, not str'

diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py
index 4c4a34fdcc07c78e718fd177fc267670e56d593b..48c5937ceb5183cfb8423a613a0450664a944036 100644 (file)
--- a/mediagoblin/auth/views.py
+++ b/mediagoblin/auth/views.py
@@ -44,11 +44,12 @@ def register(request):
 
     if request.method == 'POST' and register_form.validate():
         # TODO: Make sure the user doesn't exist already
-
+        username = unicode(request.POST['username'].lower())
+        email = unicode(request.POST['email'].lower())
         users_with_username = request.db.User.find(
-            {'username': request.POST['username'].lower()}).count()
+            {'username': username}).count()
         users_with_email = request.db.User.find(
-            {'email': request.POST['email'].lower()}).count()
+            {'email': email}).count()
 
         extra_validation_passes = True
 
@@ -64,8 +65,8 @@ def register(request):
         if extra_validation_passes:
             # Create the user
             user = request.db.User()
-            user['username'] = request.POST['username'].lower()
-            user['email'] = request.POST['email'].lower()
+            user['username'] = username
+            user['email'] = email
             user['pw_hash'] = auth_lib.bcrypt_gen_password_hash(
                 request.POST['password'])
             user.save(validate=True)

diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index 0b1a98f1d6617fb89b1adc4fc810b0ed28b7695d..2a8358163566cd304938df0b5c1b4a3343777046 100644 (file)
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import uuid
 
 from webob import exc
 from string import split
@@ -53,15 +54,17 @@ def edit_media(request, media):
             form.slug.errors.append(
                 _(u'An entry with that slug already exists for this user.'))
         else:
-            media['title'] = request.POST['title']
-            media['description'] = request.POST.get('description')
+            media['title'] = unicode(request.POST['title'])
+            media['description'] = unicode(request.POST.get('description'))
             media['tags'] = convert_to_tag_list_of_dicts(
                                    request.POST.get('tags'))
             
             media['description_html'] = cleaned_markdown_conversion(
                 media['description'])
 
-            media['slug'] = request.POST['slug']
+            media['slug'] = unicode(request.POST['slug'])
+            task_id = unicode(uuid.uuid4())
+            media['queued_task_id'] = task_id
             media.save()
 
             return redirect(request, "mediagoblin.user_pages.media_home",
@@ -102,8 +105,8 @@ def edit_profile(request):
         bio = user.get('bio'))
 
     if request.method == 'POST' and form.validate():
-            user['url'] = request.POST['url']
-            user['bio'] = request.POST['bio']
+            user['url'] = unicode(request.POST['url'])
+            user['bio'] = unicode(request.POST['bio'])
 
             user['bio_html'] = cleaned_markdown_conversion(user['bio'])
 

diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py
index 1340da605092fd36ab6c8a06225feabe2f351ece..125f727072c56e49e634bbdc90228e60c0c63723 100644 (file)
--- a/mediagoblin/routing.py
+++ b/mediagoblin/routing.py
@@ -21,6 +21,7 @@ from mediagoblin.submit.routing import submit_routes
 from mediagoblin.user_pages.routing import user_routes
 from mediagoblin.edit.routing import edit_routes
 from mediagoblin.listings.routing import tag_routes
+from mediagoblin.confirm.routing import confirm_routes
 
 
 def get_mapper():
@@ -36,5 +37,6 @@ def get_mapper():
     mapping.extend(user_routes, '/u')
     mapping.extend(edit_routes, '/edit')
     mapping.extend(tag_routes, '/tag')
+    mapping.extend(confirm_routes, '/confirm')
 
     return mapping

diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py
index 1ba17954fa684f9bd5df22afccf9ea6ef955fe68..5bcc53937f61dd180bb873f2f7f0681749ac89ed 100644 (file)
--- a/mediagoblin/submit/views.py
+++ b/mediagoblin/submit/views.py
@@ -55,10 +55,10 @@ def submit_start(request):
             entry = request.db.MediaEntry()
             entry['_id'] = ObjectId()
             entry['title'] = (
-                request.POST['title']
+                unicode(request.POST['title'])
                 or unicode(splitext(filename)[0]))
 
-            entry['description'] = request.POST.get('description')
+            entry['description'] = unicode(request.POST.get('description'))
             entry['description_html'] = cleaned_markdown_conversion(
                 entry['description'])
             

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 6747fddc59e7eeab45505c78491ad07f2a9845e4..c80144aa6694abbda32bfa6ab4caf2ada9dd50b2 100644 (file)
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -127,8 +127,11 @@
                      class="media_icon" />edit</a>
           </p>
           <p>
-            <img src="{{ request.staticdirect('/images/icon_delete.png') }}"
-                 class="media_icon" />{% trans %}delete{% endtrans %}
+            <a href="{{ request.urlgen('mediagoblin.confirm.confirm_delete',
+                                       user= media.uploader().username,
+                                       media= media._id) }}"
+               ><img src="{{ request.staticdirect('/images/icon_delete.png') }}"
+                 class="media_icon" />{% trans %}delete{% endtrans %}</a>
           </p>
         {% endif %}
 

diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py
index bf9f12ab287ae9c161c0a347fbf3a71de6ba6d5e..1283355ad9a8b6617c8bd8b85c59ab6efce551a6 100644 (file)
--- a/mediagoblin/user_pages/routing.py
+++ b/mediagoblin/user_pages/routing.py
@@ -29,6 +29,8 @@ user_routes = [
           controller="mediagoblin.user_pages.views:media_home"),
     Route('mediagoblin.edit.edit_media', "/{user}/m/{media}/edit/",
         controller="mediagoblin.edit.views:edit_media"),
+    Route('mediagoblin.confirm.confirm_delete', "/{user}/m/{media}/confirm/",
+        controller="mediagoblin.confirm.views:confirm_delete"),
     Route('mediagoblin.user_pages.atom_feed', '/{user}/atom/',
         controller="mediagoblin.user_pages.views:atom_feed"),
     Route('mediagoblin.user_pages.media_post_comment',

diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index 3677c134a1e9d2cf5c2799792d705f529c7c1c62..bb789f422dbecbe780bb2d7bce7d65f9b1c6fb2b 100644 (file)
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -129,7 +129,7 @@ def media_post_comment(request):
     comment = request.db.MediaComment()
     comment['media_entry'] = ObjectId(request.matchdict['media'])
     comment['author'] = request.user['_id']
-    comment['content'] = request.POST['comment_content']
+    comment['content'] = unicode(request.POST['comment_content'])
 
     comment['content_html'] = cleaned_markdown_conversion(comment['content'])