From 7d0efbae2955cf58eed86daa30cd3507c9088269 Mon Sep 17 00:00:00 2001 From: Joar Wandborg Date: Tue, 30 Aug 2011 23:11:49 +0200 Subject: [PATCH] Deleted old `mediagoblin.confirm` files --- mediagoblin/confirm/__init__.py | 17 ------ mediagoblin/confirm/forms.py | 26 --------- mediagoblin/confirm/lib.py | 24 -------- mediagoblin/confirm/routing.py | 21 ------- mediagoblin/confirm/views.py | 56 ------------------- .../mediagoblin/confirm/confirm_delete.html | 48 ---------------- 6 files changed, 192 deletions(-) delete mode 100644 mediagoblin/confirm/__init__.py delete mode 100644 mediagoblin/confirm/forms.py delete mode 100644 mediagoblin/confirm/lib.py delete mode 100644 mediagoblin/confirm/routing.py delete mode 100644 mediagoblin/confirm/views.py delete mode 100644 mediagoblin/templates/mediagoblin/confirm/confirm_delete.html diff --git a/mediagoblin/confirm/__init__.py b/mediagoblin/confirm/__init__.py deleted file mode 100644 index a8eeb5ed..00000000 --- a/mediagoblin/confirm/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# 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 . - - diff --git a/mediagoblin/confirm/forms.py b/mediagoblin/confirm/forms.py deleted file mode 100644 index 4529528b..00000000 --- a/mediagoblin/confirm/forms.py +++ /dev/null @@ -1,26 +0,0 @@ -# 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 . - - -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 deleted file mode 100644 index 2efc3735..00000000 --- a/mediagoblin/confirm/lib.py +++ /dev/null @@ -1,24 +0,0 @@ -# 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 . - - -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 deleted file mode 100644 index d8c1ef22..00000000 --- a/mediagoblin/confirm/routing.py +++ /dev/null @@ -1,21 +0,0 @@ -# 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 . - - -from routes.route import Route - -confirm_routes = [ -] diff --git a/mediagoblin/confirm/views.py b/mediagoblin/confirm/views.py deleted file mode 100644 index a4a63582..00000000 --- a/mediagoblin/confirm/views.py +++ /dev/null @@ -1,56 +0,0 @@ -# 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 . - -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 deleted file mode 100644 index 67d45811..00000000 --- a/mediagoblin/templates/mediagoblin/confirm/confirm_delete.html +++ /dev/null @@ -1,48 +0,0 @@ -{# -# 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 . -#} -{% extends "mediagoblin/base.html" %} - -{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} - -{% block mediagoblin_content %} - -
-
-

- {%- trans title=media['title'] -%} - Really delete {{ title }}? - {%- endtrans %} -

-

- - {%- trans -%} - If you choose yes, the media entry will be deleted permanently. - {%- endtrans %} - -

- - {{ wtforms_util.render_divs(form) }} -
- -
-
-
-{% endblock %} -- 2.25.1