8000 change limit of Event modal to attendees_limit due to limit is one of… · python012/guest@9dedf3a · GitHub
[go: up one dir, main page]
Skip to content

Commit 9dedf3a

Browse files
python012python012
committed
change limit of Event modal to attendees_limit due to limit is one of reserved words in MySql
1 parent f8a2d02 commit 9dedf3a

File tree

5 files changed

+30
-10
lines changed

5 files changed

+30
-10
lines changed

‎sign/migrations/0002_auto_20180610_1323.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Generated by Django 2.0.6 on 2018-06-10 13:23
2+
3+
from django.db import migrations
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('sign', '0001_initial'),
10+
]
11+
12+
operations = [
13+
migrations.RenameField(
14+
model_name='event',
15+
old_name='limit',
16+
new_name='attendees_limit',
17+
),
18+
]

‎sign/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class Event(models.Model):
1313
model for the Press Conference
1414
"""
1515
name = models.CharField(max_length=100) # 发布会标题
16-
limit = models.IntegerField() # 参加人数
16+
attendees_limit = models.IntegerField() # 参加人数限制
1717
status = models.BooleanField() # 状态
1818
address = models.CharField(max_length=200) # 地址
1919
start_time = models.DateTimeField('events time') # 发布会开始时间

‎sign/templates/event_manage.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<th>id</th>
5555
<th>名称</th>
5656
<th>状态</th>
57+
<th>人数限制</th>
5758
<th>地址</th>
5859
<th>时间</th>
5960
</tr>
@@ -64,6 +65,7 @@
6465
<td>{{ event.id }}</td>
6566
<td>{{ event.name }}</td>
6667
<td>{{ event.status }}</td>
68+
<td>{{ event.attendees_limit }}</td>
6769
<td>{{ event.address }}</td>
6870
<td>{{ event.start_time }}</td>
6971
<td>

‎sign/tests.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def setUp(self):
99
Event.objects.create(id=1,
1010
name="iPhone X event",
1111
status=True,
12-
limit=2000,
12+
attendees_limit=2000,
1313
address='somewhere in USA',
1414
start_time='2015-09-08 14:12:00')
1515
Guest.objects.create(id=1,
@@ -87,7 +87,7 @@ def setUp(self):
8787
User.objects.create_user('admin', 'admin@dj.com', 'admin123456')
8888
Event.objects.create(id=1,
8989
name="Moto X",
90-
limit="1000",
90+
attendees_limit="1000",
9191
address="Sunnyvale",
9292
status=1,
9393
start_time="2014-8-12 12:30:00")
@@ -114,7 +114,7 @@ def setUp(self):
114114
User.objects.create_user('admin', 'admin@dj.com', 'admin123456')
115115
Event.objects.create(id=1,
116116
name="Moto X",
117-
limit="1000",
117+
attendees_limit="1000",
118118
address="Sunnyvale",
119119
status=1,
120120
start_time="2014-8-12 12:30:00")
@@ -146,13 +146,13 @@ def setUp(self):
146146
User.objects.create_user('admin', 'admin@wi.com', 'admin123456')
147147
Event.objects.create(id=1,
148148
name="Moto X Release",
149-
limit="1000",
149+
attendees_limit="1000",
150150
address="Sunnyvale",
151151
status=1,
152152
start_time="2014-8-12 12:30:00")
153153
Event.objects.create(id=2,
154154
name="iPhone X Release",
155-
limit="800",
155+
attendees_limit="800",
156156
address="Pala Anto",
157157
status=1,
158158
start_time="2016-6-12 9:30:00")

‎sign/views_if.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
def add_event(request):
99
eid = request.POST.get('eid', '')
1010
name = request.POST.get('name', '')
11-
limit = request.POST.get('limit', '')
11+
attendees_limit = request.POST.get('attendees_limit', '')
1212
status = request.POST.get('status', '')
1313
address = request.POST.get('address', '')
1414
start_time = request.POST.get('start_time', '')
1515

16-
if eid == '' or name == '' or limit == '' or address == '' or start_time == '':
16+
if eid == '' or name == '' or attendees_limit == '' or address == '' or start_time == '':
1717
return JsonResponse({'status': 10021, 'message': 'parameter error'})
1818

1919
result = Event.objects.filter(id=eid)
@@ -31,7 +31,7 @@ def add_event(request):
3131
Event.objects.create(id=eid,
3232
name=name,
3333
status=int(status),
34-
limit=limit,
34+
attendees_limit=attendees_limit,
3535
address=address,
3636
start_time=start_time)
3737
except ValidationError:
@@ -60,7 +60,7 @@ def add_guest(request):
6060
if not result:
6161
return JsonResponse({'status': 10023, 'message':'event status is not available'})
6262

63-
event_limit = Event.objects.get(id=eid).limit
63+
event_limit = Event.objects.get(id=eid).attendees_limit
6464
guest_limit = len(Guest.objects.filter(event_id=eid))
6565

6666
if guest_limit >= event_limit:

0 commit comments

Comments
 (0)
0