Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't show a name of "None" if not using Google Apps authentication. 

Previously we used the value of gafyd_name in forms, which means that if
it was undefined we'd end up with a string literal "None" being passed to
the registration form by the confirmation redirector.

(imported from commit c8fbb749bb793c8e927e86603ce196bf810f3f6a)
This commit is contained in:
Luke Faraone 2013-04-30 11:28:15 -07:00
parent f36d51edeb
commit 4491f7b1d8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/confirmation/confirm_preregistrationuser.html
View File

@ -12,7 +12,7 @@ post to another view which executes in our code to produce the desired form.
{% csrf_token %}
<input type="hidden" value="{{ key }}" name="key"/>
<input type="hidden" value="1" name="from_confirmation"/>
<input type="hidden" value="{{ gafyd_name }}" name="gafyd_name"/>
<input type="hidden" value="{% if gafyd_name %}{{ gafyd_name }}{% endif %}" name="gafyd_name"/>
</form>
<script type="text/javascript">

2
templates/zephyr/register.html
View File

@ -36,7 +36,7 @@ Form is validated both client-side using jquery-validate (see signup.js) and ser
<label for="id_full_name" class="control-label">Full name</label>
<div class="controls">
<input id="id_full_name" class="required" type="text" name="full_name"
value="{% if form.full_name.value %}{{ form.full_name.value }}{% else %}{{ gafyd_name }}{% endif %}"
value="{% if form.full_name.value %}{{ form.full_name.value }}{% elif gafyd_name %}{{ gafyd_name }}{% endif %}"
maxlength="100" />
{% if form.full_name.errors %}
{% for error in form.full_name.errors %}