Skip to content

Delete venue #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dirn wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Delete venue #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a48096
Add OptionalIf validator
dirn Aug 29, 2012
6ff7a71
Allow users to delete claimed venues
dirn Sep 2, 2012
2a156d5
Allow users to restored deleted venues
dirn Sep 5, 2012
381f7d5
Remove deleted venues from need page
dirn Sep 12, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions meetups/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@

from collections import namedtuple
from wtforms import (Form, validators, TextField, TextAreaField, BooleanField,
IntegerField, HiddenField)
IntegerField, HiddenField, SubmitField)
from .validators import OptionalIf


class UserProfileForm(Form):
Expand All @@ -50,7 +51,8 @@ class VenueEditForm(Form):
contact_phone = TextField('Contact Phone', [validators.Required()])

capacity = IntegerField('Maximum Capacity',
[validators.NumberRange(min=0)])
[OptionalIf(field='delete'), validators.Required(),
validators.NumberRange(min=0)])

# Optional questionnaire fields
need_names = BooleanField('A list of names is required ahead of time.')
Expand All @@ -60,6 +62,9 @@ class VenueEditForm(Form):
instructions = TextAreaField('Special instructions '
'(e.g., take a particular evelvator, use a specific door)')

delete = SubmitField('Delete')
undelete = SubmitField('Restore')


class VenueClaimForm(VenueEditForm):
"""Extends the :class:`~meetup.forms.VenueEditForm` to add a confirmation
Expand Down
3 changes: 3 additions & 0 deletions meetups/templates/account/venues.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ <h1>My Spaces</h1>
{% for venue in venues %}
<li>
<h3>{{ venue }}</h3>
{% if venue.deleted %}
<span class="label label-important">deleted</span>
{% endif %}
{% for tag in venue.taglist %}
<span class="label">{{ tag }}</span>
{% endfor %}
Expand Down
8 changes: 7 additions & 1 deletion meetups/templates/venue/claim.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,19 @@ <h1>{{ venue }}</h1>
</fieldset>
{%- endif -%}

<button type="submit" class="btn btn-primary">
<button type="submit" class="btn btn-success">
{%- if 'confirm' in form -%}
Claim
{%- else -%}
Update
{%- endif -%}
</button>

{% if venue.deleted -%}
<input type="submit" name="undelete" class="btn" value="Update &amp; {{ form.undelete.label.text }}">
{%- else -%}
<input type="submit" name="delete" class="btn" value=" {%- if 'confirm' in form -%} Claim {%- else -%} Update {%- endif %} &amp; {{ form.delete.label.text }}">
{%- endif -%}
</form>
</div>
{%- endblock %}
41 changes: 41 additions & 0 deletions meetups/validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Copyright (c) 2012, The NYC Python Meetup
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# * Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
#
# * Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.

from wtforms import validators


class OptionalIf(object):
"""Make a form field optional if a specific field has a value.

This validator can be chained together with other validators such as
:class:`~wtforms.validators.Required` and override them.
"""
def __init__(self, field):
self.field = field

def __call__(self, form, field):
if self.field in form and form[self.field].data:
field.errors[:] = []
raise validators.StopValidation()
26 changes: 19 additions & 7 deletions meetups/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def logout():
@login_required
def need():
user = User(_id=int(session['member_id'])).load()
groups = get_groups({'_id': {'$in': user.organizer_of}})
groups = get_groups({'_id': {'$in': user.organizer_of, 'deleted': False}})
return render_template('need.html',
user=user,
groups=groups,
Expand Down Expand Up @@ -283,12 +283,24 @@ def get_contact_field(attr):

form = form_class(request.form, obj=venue)
if request.method == 'POST' and form.validate():
venue.claim(contact_name=form.contact_name.data,
contact_email=form.contact_email.data,
contact_phone=form.contact_phone.data, user_id=user._id,
capacity=form.capacity.data, need_names=form.need_names.data,
food=form.food.data, av=form.av.data, chairs=form.chairs.data,
instructions=form.instructions.data)
claim = {
'contact_name': form.contact_name.data,
'contact_email': form.contact_email.data,
'contact_phone': form.contact_phone.data,
'user_id': user._id,
'capacity': form.capacity.data,
'need_names': form.need_names.data,
'food': form.food.data,
'av': form.av.data,
'chairs': form.chairs.data,
'instructions': form.instructions.data
}
if 'delete' in request.form:
claim['deleted'] = True
elif 'undelete' in request.form:
claim['deleted'] = False

venue.claim(**claim)

flash('Thank you for %s %s' % (
'updating' if venue.claimed else 'claiming', venue.name), 'success')
Expand Down
64 changes: 64 additions & 0 deletions tests/test_validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
from unittest import TestCase

from meetups.validators import OptionalIf
from wtforms.validators import StopValidation


# The Dummy* classes are borrowed from tests.validators in wtforms
class DummyTranslations(object):
def gettext(self, string):
return string

def ngettext(self, singular, plural, n):
if n == 1:
return singular

return plural


class DummyForm(dict):
pass


class DummyField(object):
_translations = DummyTranslations()

def __init__(self, data, errors=(), raw_data=None):
self.data = data
self.errors = list(errors)
self.raw_data = raw_data

def gettext(self, string):
return self._translations.gettext(string)

def ngettext(self, singular, plural, n):
return self._translations.ngettext(singular, plural, n)


class ValidatorsTest(TestCase):
"""Test custom validators"""
def setUp(self):
self.form = DummyForm()

def test_optional_if_field_does_not_exist(self):
(u"Test that the field doesn't pass the optional validation when "
"the other field doesn't exist.")
self.assertEqual(
OptionalIf('spam')(self.form, DummyField('eggs')),
None
)

def test_optional_if_field_exists(self):
(u'Test that the field is optional when the other field exists.')
self.form['spam'] = DummyField(True)
self.form['eggs'] = DummyField(None, ['Error message'])

# When the field exists, OptionalIf should raise OptionalIf and the
# `len()` of its `errors` attribute should be 0.
self.assertRaises(
StopValidation,
OptionalIf('spam'),
self.form,
self.form['eggs']
)
self.assertEqual(len(self.form['eggs'].errors), 0)