mirror of
https://github.com/fspc/workstand.git
synced 2026-09-16 16:41:38 -04:00
Not sure why these aren't in master but here we go! (#34)
* Load webpack only in debug. * Second stab at buildfile. * Move button. * Add new line. * Linting. * Spelling mistake. * Clean up. * Use babel-polyfill. * Updated Configuration Files for Fresh Install
This commit is contained in:
@@ -35,4 +35,4 @@ class CustomUserAdmin(UserAdmin):
|
||||
class MemberAdmin(admin.ModelAdmin):
|
||||
list_display = ('get_full_name',)
|
||||
ordering = ('last_name',)
|
||||
search_fields = ('email', 'first_name', 'last_name')
|
||||
search_fields = ('email', 'first_name', 'last_name')
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
from django.forms import ModelForm, EmailInput, TextInput, DateInput, CheckboxSelectMultiple, CharField, CheckboxInput, BooleanField
|
||||
from django.forms import ModelForm, EmailInput, TextInput, DateInput, CheckboxInput, BooleanField
|
||||
from django.utils import timezone
|
||||
from registration.models import Member
|
||||
|
||||
|
||||
class MemberForm(ModelForm):
|
||||
waiver_substitute = BooleanField(required=False, label='I have read and agree to the above terms & conditions.', widget=CheckboxInput(attrs={'class': 'mdl-checkbox__input'}))
|
||||
waiver_substitute = BooleanField(required=False, label='I have read and agree to the above terms & conditions.',
|
||||
widget=CheckboxInput(attrs={'class': 'mdl-checkbox__input'}))
|
||||
|
||||
class Meta:
|
||||
model = Member
|
||||
|
||||
@@ -10,4 +10,4 @@ class MemberSerializer(ModelSerializer):
|
||||
|
||||
class Meta:
|
||||
model = Member
|
||||
fields = ('first_name', 'last_name', 'email', 'id')
|
||||
fields = ('first_name', 'last_name', 'email', 'id')
|
||||
|
||||
@@ -8,10 +8,8 @@ from django.test import Client, TestCase
|
||||
|
||||
from core.models import Visit
|
||||
from model_mommy import mommy
|
||||
from copy import copy
|
||||
|
||||
from ..models import CustomUser, Member
|
||||
from ..views import MemberFormView
|
||||
|
||||
logger = logging.getLogger('bikeshop')
|
||||
|
||||
@@ -37,7 +35,7 @@ class TestMemberFormView(TestCase):
|
||||
'last_name': 'Last',
|
||||
'post_code': 'H0H0H0',
|
||||
}
|
||||
response = c.post(url, data=member_data)
|
||||
c.post(url, data=member_data)
|
||||
new_member = Member.objects.get(first_name='First', last_name='Last')
|
||||
self.assertTrue(new_member)
|
||||
|
||||
|
||||
@@ -58,7 +58,8 @@ class MemberFormView(View):
|
||||
class MemberSearchView(View):
|
||||
def get(self, request, query):
|
||||
sqs = SearchQuerySet().models(Member).autocomplete(text=query)[:5]
|
||||
results = [dict(name=result.object.get_full_name(), email=result.object.email, id=result.object.id) for result in sqs]
|
||||
results = [dict(name=result.object.get_full_name(), email=result.object.email, id=result.object.id)
|
||||
for result in sqs]
|
||||
|
||||
data = json.dumps(dict(results=results))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user