* Fix bad commit (oops!)

* Delete works now

6 files changed, 184 insertions, 0 deletions

diff --git a/mediagoblin/confirm/__init__.py b/mediagoblin/confirm/__init__.py
new file mode 100644
index 00000000..a8eeb5ed
--- /dev/null
+++ b/mediagoblin/confirm/__init__.py
@@ -0,0 +1,17 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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/>.
+
+
diff --git a/mediagoblin/confirm/forms.py b/mediagoblin/confirm/forms.py
new file mode 100644
index 00000000..4529528b
--- /dev/null
+++ b/mediagoblin/confirm/forms.py
@@ -0,0 +1,26 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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 wtforms
+
+from mediagoblin.util import fake_ugettext_passthrough as _
+
+class ConfirmDeleteForm(wtforms.Form):
+    confirm = wtforms.RadioField('Confirm',
+                                 default='False',
+                                 choices=[('False', 'No, I made a mistake!'),
+                                          ('True', 'Yes, delete it!')])
diff --git a/mediagoblin/confirm/lib.py b/mediagoblin/confirm/lib.py
new file mode 100644
index 00000000..2efc3735
--- /dev/null
+++ b/mediagoblin/confirm/lib.py
@@ -0,0 +1,24 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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/>.
+
+
+def may_delete_media(request, media):
+    """Check, if the request's user may edit the media details"""
+    if media['uploader'] == request.user['_id']:
+        return True
+    if request.user['is_admin']:
+        return True
+    return False
diff --git a/mediagoblin/confirm/routing.py b/mediagoblin/confirm/routing.py
new file mode 100644
index 00000000..d8c1ef22
--- /dev/null
+++ b/mediagoblin/confirm/routing.py
@@ -0,0 +1,21 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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/>.
+
+
+from routes.route import Route
+
+confirm_routes = [
+]
diff --git a/mediagoblin/confirm/views.py b/mediagoblin/confirm/views.py
new file mode 100644
index 00000000..a4a63582
--- /dev/null
+++ b/mediagoblin/confirm/views.py
@@ -0,0 +1,56 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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
+
+from mediagoblin import messages
+from mediagoblin import mg_globals
+from mediagoblin.util import (
+    render_to_response, redirect, clean_html, convert_to_tag_list_of_dicts,
+    media_tags_as_string, cleaned_markdown_conversion)
+from mediagoblin.util import pass_to_ugettext as _
+from mediagoblin.confirm import forms
+from mediagoblin.confirm.lib import may_delete_media
+from mediagoblin.decorators import require_active_login, get_user_media_entry
+
+
+@get_user_media_entry
+@require_active_login
+def confirm_delete(request, media):
+    if not may_delete_media(request, media):
+        return exc.HTTPForbidden()
+
+    form = forms.ConfirmDeleteForm(request.POST)
+
+    if request.method == 'POST' and form.validate():
+        if request.POST.get('confirm') == 'True':
+            username = media.uploader()['username']
+            media.delete()
+            return redirect(request, "mediagoblin.user_pages.user_home",
+                user=username)
+        else:
+            return redirect(request, "mediagoblin.user_pages.media_home",
+                            user=media.uploader()['username'],
+                            media=media['slug'])
+
+    return render_to_response(
+        request,
+        'mediagoblin/confirm/confirm_delete.html',
+        {'media': media,
+         'form': form})
diff --git a/mediagoblin/templates/mediagoblin/confirm/confirm_delete.html b/mediagoblin/templates/mediagoblin/confirm/confirm_delete.html
new file mode 100644
index 00000000..ada89d5d
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/confirm/confirm_delete.html
@@ -0,0 +1,40 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 Free Software Foundation, Inc
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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/>.
+#}
+{% extends "mediagoblin/base.html" %}
+
+{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
+
+{% block mediagoblin_content %}
+
+  <form action="{{ request.urlgen('mediagoblin.confirm.confirm_delete',
+		                  user=media.uploader().username,
+				  media=media._id) }}"
+        method="POST" enctype="multipart/form-data">
+    <div class="grid_8 prefix_1 suffix_1 edit_box form_box">
+      <h1>
+        {%- trans title=media['title'] -%}
+          Really delete {{ title }}?
+        {%- endtrans %}
+      </h1>
+      {{ wtforms_util.render_divs(form) }}
+      <div class="form_submit_buttons">
+        <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button" />
+      </div>
+    </div>
+  </form>
+{% endblock %}