Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
roomlist
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
23
Issues
23
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
SRCT
roomlist
Commits
51809912
Commit
51809912
authored
Jan 28, 2016
by
Daniel W Bond
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added customized form display for welcome name page
parent
53cf5013
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
66 additions
and
10 deletions
+66
-10
roomlist/accounts/forms.py
roomlist/accounts/forms.py
+4
-6
roomlist/accounts/templates/welcome_name.html
roomlist/accounts/templates/welcome_name.html
+57
-3
roomlist/accounts/views.py
roomlist/accounts/views.py
+5
-1
No files found.
roomlist/accounts/forms.py
View file @
51809912
...
...
@@ -108,12 +108,10 @@ class StudentUpdateForm(forms.Form):
class
WelcomeNameForm
(
forms
.
Form
):
first_name
=
forms
.
CharField
(
label
=
'First Name'
,
required
=
False
)
last_name
=
forms
.
CharField
(
label
=
'Last Name'
,
required
=
False
)
gender
=
MultiSelectFormField
(
choices
=
Student
.
GENDER_CHOICES
,
label
=
'Gender Identity (please choose all that apply)'
,
required
=
False
)
show_gender
=
BooleanRadioField
(
label
=
'Show your gender on your profile?'
)
first_name
=
forms
.
CharField
(
required
=
False
)
last_name
=
forms
.
CharField
(
required
=
False
)
gender
=
MultiSelectFormField
(
choices
=
Student
.
GENDER_CHOICES
,
required
=
False
)
show_gender
=
BooleanRadioField
()
class
WelcomePrivacyForm
(
forms
.
ModelForm
):
...
...
roomlist/accounts/templates/welcome_name.html
View file @
51809912
...
...
@@ -35,10 +35,64 @@
<div
class=
"panel-heading"
>
<h1
class=
"panel-title text-center"
><strong>
Name
&
Gender
</strong></h1>
</div>
{% if error in my_form.non_field_errors %}
<ul
class=
"text-center"
>
{% for error in my_form.non_field_errors %}
<li>
{{ error }}
</li>
{% endfor %}
</ul>
{% endif %}
<div
class=
"panel-body"
>
<form
action=
""
method=
"post"
>
{% csrf_token %}
{{ my_form.as_p }}
<form
class=
"form-horizontal"
autocomplete=
"off"
action=
""
method=
"post"
>
{% csrf_token %}
<fieldset>
<div
class=
"form-group"
>
<label
for=
"{{ my_form.first_name.id_for_label }}"
class=
"col-md-2"
>
First Name
</label>
<div
class=
"col-md-4"
>
{% if not my_form.first_name.errors %}
{{ my_form.first_name }}
{% else %}
<div
class=
"has-error"
>
{{ my_form.first_name }}
<p>
{{ form.first_name.errors }}
</p>
</div>
{% endif %}
</div>
<label
for=
"{{ my_form.last_name.id_for_label }}"
class=
"col-md-2"
>
Last Name
</label>
<div
class=
"col-md-4"
>
{% if not my_form.last_name.errors %}
{{ my_form.last_name }}
{% else %}
<div
class=
"has-error"
>
{{ my_form.last_name }}
<p>
{{ form.last_name.errors }}
</p>
</div>
{% endif %}
</div>
</div>
<div
class=
"form-group"
>
<label
for=
"{{ my_form.gender.id_for_label }}"
class=
"col-md-3"
>
Gender Identity
<br
/>
(choose all that apply)
</label>
{% for checkbox in my_form.gender %}
<div
class=
"checkbox col-md-3"
>
<label
for=
"{{ checkbox.id_for_label }}"
>
{{ checkbox.choice_label }}
{{ checkbox.tag }}
</div>
{% endfor %}
</div>
<div
class=
"form-group"
>
<label
for
"{{
my_form.show_gender.id_for_label
}}"
class=
"col-md-3"
>
Show Gender on Profile?
</label>
{% for radio in my_form.show_gender %}
<label
class=
"radio-inline"
>
{{ radio.choice_label }}{{ radio.tag }}
</label>
{% endfor %}
</div>
</fieldset>
<input
type=
"submit"
value=
"Save"
class=
"btn btn-primary"
/>
</form>
</div>
...
...
roomlist/accounts/views.py
View file @
51809912
...
...
@@ -352,6 +352,10 @@ class WelcomeName(LoginRequiredMixin, FormView):
'last_name'
:
me
.
user
.
last_name
,
'gender'
:
me
.
gender
,
'show_gender'
:
me
.
show_gender
,
})
form
.
fields
[
'first_name'
].
widget
.
attrs
[
'class'
]
=
'form-control'
form
.
fields
[
'last_name'
].
widget
.
attrs
[
'class'
]
=
'form-control'
context
[
'my_form'
]
=
form
return
context
...
...
@@ -367,7 +371,7 @@ class WelcomeName(LoginRequiredMixin, FormView):
me
.
user
.
last_name
=
form
.
data
[
'last_name'
]
me
.
gender
=
form
.
data
.
getlist
(
'gender'
)
me
.
show_gender
=
form
.
data
.
get
(
'show_gender'
,
False
)
me
.
show_gender
=
strtobool
(
form
.
data
.
get
(
'show_gender'
,
'False'
)
)
me
.
completedName
=
True
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment