Replace name_on_certificates property with name_on_documents, since mentors, club admins, hosts and org admins don't get certificates it's better to name it 'Name on documents' which can indicate any kind of documents including awards certificates. Also don't show name_on_documents in public Role profiles, instead show user public name in that place.
Patch by: Pawel Solyga
Reviewed by: to-be-reviewed
--- a/app/soc/models/role.py Sat Jan 31 21:32:29 2009 +0000
+++ b/app/soc/models/role.py Sat Jan 31 22:23:23 2009 +0000
@@ -102,13 +102,13 @@
#: the Role would like it displayed (could be surname followed by
#: given name in some cultures, for example). Display names can be
#: any valid UTF-8 text.
- name_on_certificates = db.StringProperty(
- verbose_name=ugettext('Display Name'))
- name_on_certificates.help_text = ugettext(
- 'Optional field used as a display name, such as for awards '
- 'certificates. Should be the entire name in the format '
+ name_on_documents = db.StringProperty(
+ verbose_name=ugettext('Name on documents'))
+ name_on_documents.help_text = ugettext(
+ 'Optional field used as a display name, such as for documents like '
+ 'awards certificates. Should be the entire name in the format '
'the person would like it displayed (could be family name followed '
- 'by given name in some cultures, for example). Display names can be '
+ 'by given name in some cultures, for example). Name on documents can be '
'any valid UTF-8 text.')
#====================================================================
--- a/app/soc/templates/soc/club_admin/public.html Sat Jan 31 21:32:29 2009 +0000
+++ b/app/soc/templates/soc/club_admin/public.html Sat Jan 31 22:23:23 2009 +0000
@@ -22,7 +22,7 @@
<p>
<table>
{% readonly_field_as_table_row entity.fields.link_id.label entity.link_id %}
- {% readonly_field_as_table_row entity.fields.name_on_certificates.label entity.name_on_certificates %}
+ {% readonly_field_as_table_row entity.user.fields.public_name.label entity.user.public_name %}
{% readonly_field_as_table_row entity.fields.im_handle.label entity.im_handle %}
{% readonly_field_as_table_row entity.fields.res_country.label entity.res_country %}
</table>
--- a/app/soc/templates/soc/club_member/public.html Sat Jan 31 21:32:29 2009 +0000
+++ b/app/soc/templates/soc/club_member/public.html Sat Jan 31 22:23:23 2009 +0000
@@ -22,7 +22,7 @@
<p>
<table>
{% readonly_field_as_table_row entity.fields.link_id.label entity.link_id %}
- {% readonly_field_as_table_row entity.fields.name_on_certificates.label entity.name_on_certificates %}
+ {% readonly_field_as_table_row entity.user.fields.public_name.label entity.user.public_name %}
{% readonly_field_as_table_row entity.fields.im_handle.label entity.im_handle %}
{% readonly_field_as_table_row entity.fields.res_country.label entity.res_country %}
</table>
--- a/app/soc/templates/soc/host/public.html Sat Jan 31 21:32:29 2009 +0000
+++ b/app/soc/templates/soc/host/public.html Sat Jan 31 22:23:23 2009 +0000
@@ -23,7 +23,7 @@
<table>
{% readonly_field_as_table_row entity.fields.given_name.label entity.given_name %}
{% readonly_field_as_table_row entity.fields.surname.label entity.surname %}
- {% readonly_field_as_table_row entity.fields.name_on_certificates.label entity.name_on_certificates %}
+ {% readonly_field_as_table_row entity.user.fields.public_name.label entity.user.public_name %}
<!-- TODO(pawel.solyga) make this generic -->
</table>
</p>
--- a/app/soc/templates/soc/mentor/public.html Sat Jan 31 21:32:29 2009 +0000
+++ b/app/soc/templates/soc/mentor/public.html Sat Jan 31 22:23:23 2009 +0000
@@ -22,7 +22,7 @@
<p>
<table>
{% readonly_field_as_table_row entity.fields.link_id.label entity.link_id %}
- {% readonly_field_as_table_row entity.fields.name_on_certificates.label entity.name_on_certificates %}
+ {% readonly_field_as_table_row entity.user.fields.public_name.label entity.user.public_name %}
{% readonly_field_as_table_row entity.fields.im_handle.label entity.im_handle %}
{% readonly_field_as_table_row entity.fields.res_country.label entity.res_country %}
</table>
--- a/app/soc/templates/soc/org_admin/public.html Sat Jan 31 21:32:29 2009 +0000
+++ b/app/soc/templates/soc/org_admin/public.html Sat Jan 31 22:23:23 2009 +0000
@@ -22,7 +22,7 @@
<p>
<table>
{% readonly_field_as_table_row entity.fields.link_id.label entity.link_id %}
- {% readonly_field_as_table_row entity.fields.name_on_certificates.label entity.name_on_certificates %}
+ {% readonly_field_as_table_row entity.user.fields.public_name.label entity.user.public_name %}
{% readonly_field_as_table_row entity.fields.im_handle.label entity.im_handle %}
{% readonly_field_as_table_row entity.fields.res_country.label entity.res_country %}
</table>