Merge branch 'master' of github.com:IceCTF/new-platform
commit
d6ce62b439
14
app.py
14
app.py
|
@ -170,6 +170,10 @@ def register():
|
||||||
flash("Invalid Background")
|
flash("Invalid Background")
|
||||||
return render_template("register.html")
|
return render_template("register.html")
|
||||||
|
|
||||||
|
if (not gender == "") and (not gender in ["M", "F"]):
|
||||||
|
flash("Invalid gender")
|
||||||
|
return render_template("register.html")
|
||||||
|
|
||||||
confirmation_key = misc.generate_confirmation_key()
|
confirmation_key = misc.generate_confirmation_key()
|
||||||
|
|
||||||
team=None
|
team=None
|
||||||
|
@ -249,7 +253,11 @@ def user_dashboard():
|
||||||
background = request.form["background"].strip()
|
background = request.form["background"].strip()
|
||||||
country = request.form["country"].strip()
|
country = request.form["country"].strip()
|
||||||
|
|
||||||
|
tshirt_size = ""
|
||||||
|
gender = ""
|
||||||
|
if "tshirt_size" in request.form.keys():
|
||||||
tshirt_size = request.form["tshirt_size"].strip()
|
tshirt_size = request.form["tshirt_size"].strip()
|
||||||
|
if "gender" in request.form.keys():
|
||||||
gender = request.form["gender"].strip()
|
gender = request.form["gender"].strip()
|
||||||
|
|
||||||
if len(username) > 50 or not username:
|
if len(username) > 50 or not username:
|
||||||
|
@ -271,7 +279,7 @@ def user_dashboard():
|
||||||
flash("You're lying")
|
flash("You're lying")
|
||||||
return redirect(url_for('user_dashboard'))
|
return redirect(url_for('user_dashboard'))
|
||||||
|
|
||||||
if not tshirt_size in select.TShirts:
|
if (not tshirt_size == "") and (not tshirt_size in select.TShirts):
|
||||||
flash("Invalid T-shirt size")
|
flash("Invalid T-shirt size")
|
||||||
return redirect(url_for('user_dashboard'))
|
return redirect(url_for('user_dashboard'))
|
||||||
|
|
||||||
|
@ -283,6 +291,10 @@ def user_dashboard():
|
||||||
flash("Invalid Background")
|
flash("Invalid Background")
|
||||||
return redirect(url_for('user_dashboard'))
|
return redirect(url_for('user_dashboard'))
|
||||||
|
|
||||||
|
if (not gender == "") and (not gender in ["M", "F"]):
|
||||||
|
flash("Invalid gender")
|
||||||
|
return redirect(url_for('user_dashboard'))
|
||||||
|
|
||||||
email_changed = (user_email != g.user.email)
|
email_changed = (user_email != g.user.email)
|
||||||
|
|
||||||
g.user.username = username
|
g.user.username = username
|
||||||
|
|
|
@ -16,7 +16,7 @@ class Team(BaseModel):
|
||||||
return ChallengeSolve.select().where(ChallengeSolve.team == self, ChallengeSolve.challenge == challenge).count()
|
return ChallengeSolve.select().where(ChallengeSolve.team == self, ChallengeSolve.challenge == challenge).count()
|
||||||
|
|
||||||
def eligible(self):
|
def eligible(self):
|
||||||
return all([member.eligible() for member in self.members])
|
return all([member.eligible() for member in self.members]) and self.members.count() <= 3
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def score(self):
|
def score(self):
|
||||||
|
|
|
@ -1,15 +1,3 @@
|
||||||
$( document ).ready(function() {
|
$( document ).ready(function() {
|
||||||
$('select').material_select();
|
$('select').material_select();
|
||||||
|
|
||||||
if($("#country").length)
|
|
||||||
{
|
|
||||||
$("#country").change(function(e) {
|
|
||||||
if($("#country").val() == "ISL")
|
|
||||||
$("#prize-info").show("slow");
|
|
||||||
else
|
|
||||||
$("#prize-info").hide("slow");
|
|
||||||
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -118,6 +118,19 @@ $(function(){
|
||||||
$("#join-team #team_key").prop('required', true);
|
$("#join-team #team_key").prop('required', true);
|
||||||
$("#join-team #join_team").attr('val', "1");
|
$("#join-team #join_team").attr('val', "1");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$("#country").change(function(e) {
|
||||||
|
if($("#country").val() == "ISL"){
|
||||||
|
$("#prize-info").show("slow");
|
||||||
|
$("#tshirt_size").prop('required', true);
|
||||||
|
$("#male").prop('required', true);
|
||||||
|
} else {
|
||||||
|
$("#prize-info").hide("slow");
|
||||||
|
$("#tshirt_size").prop('required', false);
|
||||||
|
$("#male").prop('required', false);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -88,7 +88,7 @@
|
||||||
<label>Country</label>
|
<label>Country</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row no-bot">
|
<div id="prize-info" class="row no-bot" {% if not user.eligible() %} style="display: none;"{% endif %}>
|
||||||
<div class="input-field col s6">
|
<div class="input-field col s6">
|
||||||
<select required name="tshirt_size" id="tshirt_size">
|
<select required name="tshirt_size" id="tshirt_size">
|
||||||
{{select.genoption(select.TShirts, selected=user.tshirt_size)|safe}}
|
{{select.genoption(select.TShirts, selected=user.tshirt_size)|safe}}
|
||||||
|
@ -135,4 +135,19 @@
|
||||||
{% if first_login %}
|
{% if first_login %}
|
||||||
<script>$("#firstlogin").openModal();</script>
|
<script>$("#firstlogin").openModal();</script>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
<script>
|
||||||
|
$(function(){
|
||||||
|
$("#country").change(function(e) {
|
||||||
|
if($("#country").val() == "ISL"){
|
||||||
|
$("#prize-info").show("slow");
|
||||||
|
$("#tshirt_size").prop('required', true);
|
||||||
|
$("#male").prop('required', true);
|
||||||
|
} else {
|
||||||
|
$("#prize-info").hide("slow");
|
||||||
|
$("#tshirt_size").prop('required', false);
|
||||||
|
$("#male").prop('required', false);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
</script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
Loading…
Reference in New Issue