Merge branch 'master' of https://git.elab.kth.se/davide/KUKapp
This commit is contained in:
@@ -149,7 +149,7 @@ def addme():
|
||||
for row in r:
|
||||
results.append(dict(row))
|
||||
|
||||
if not results['is_eater']:
|
||||
if not results[0]['is_eater']:
|
||||
return render_template('appresponse.html', message='Have a nice meal ' + meal_id + " mister " + str(current_user.name) )
|
||||
else:
|
||||
return render_template('appresponse.html', message='You are already a registered eater')
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
<p>If nobody volunteers,<br><img class="flex-small-thumb" src="{{url_for('static', filename=meal.candidate + '.png')}}" title="{{meal.candidate}}" align="middle"> will cook.</p>
|
||||
<div class="rect-button" onclick="location.href='/volunteer';" style="background-color: #EE7500;">VOLUNTEER</div>
|
||||
{% else %}
|
||||
<img src="{{url_for('static', filename=meal.kuk + '.png')}}">
|
||||
<img src="{{url_for('static', filename=meal.kuk + '.png')}}" class="flex-thumb">
|
||||
<span class="username">{{ meal.kuk }}</span>
|
||||
<div class="rect-button" style="background-color: #8faf38; cursor: default;">CONFIRMED</div>
|
||||
{% endif %}
|
||||
|
||||
Reference in New Issue
Block a user