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:
Drew Larson
2017-02-16 21:17:47 -06:00
committed by GitHub
parent c202751d84
commit 960e107415
25 changed files with 120 additions and 115 deletions
+1 -1
View File
@@ -6,6 +6,6 @@ admin.site.register([Membership, Payment])
@admin.register(Visit)
class VistAdmin(admin.ModelAdmin):
class VisitAdmin(admin.ModelAdmin):
ordering = ('created_at',)
list_display = ('member', 'purpose', 'created_at')
+1 -1
View File
@@ -1,5 +1,5 @@
import logging
from django.forms import BooleanField, CharField, CheckboxInput, RadioSelect, ModelForm, TextInput, HiddenInput, ChoiceField
from django.forms import BooleanField, CharField, CheckboxInput, RadioSelect, ModelForm, TextInput, HiddenInput
from registration.models import Member
+1 -1
View File
@@ -62,7 +62,7 @@ class Visit(models.Model):
(DONATE, 'donate'),
(STAFF, 'staff'),
)
member = models.ForeignKey(
'registration.Member',
on_delete=models.CASCADE
@@ -58,3 +58,10 @@
<div id="root"></div>
{% render_bundle 'signin' %}
{% endblock %}
{% block scripts %}
{% render_bundle 'babelPolyfill' %}
{% if DEBUG %}
{% render_bundle 'webpack' %}
{% endif %}
{% endblock %}
-2
View File
@@ -1,3 +1 @@
from django.test import TestCase
# Create your tests here.
+4 -2
View File
@@ -1,5 +1,6 @@
import logging
from django.conf import settings
from django.contrib import messages
from django.core.urlresolvers import reverse
from django.http import HttpResponseRedirect
@@ -18,13 +19,14 @@ logger = logging.getLogger(__name__)
@method_decorator(login_required, name='dispatch')
class DashboardView(View):
def get(self, request):
return TemplateResponse(request, 'dashboard.html')
return TemplateResponse(request, 'dashboard.html', context={'DEBUG': settings.DEBUG})
@method_decorator(login_required, name='dispatch')
class NewMembershipView(TemplateView):
template_name = 'membership_form.html'
def get(self, request, member_id):
def get(self, request, member_id, **kwargs):
membership_form = MembershipForm(initial=dict(member=member_id))
payment_form = PaymentForm()
return self.render_to_response(dict(membership_form=membership_form, payment_form=payment_form))