diff --git a/fas/fas/templates/group/view.html b/fas/fas/templates/group/view.html
index f59418a..8441b90 100644
--- a/fas/fas/templates/group/view.html
+++ b/fas/fas/templates/group/view.html
@@ -75,6 +75,7 @@
${_('None')} |
${role.creation.astimezone(timezone).strftime('%Y-%m-%d %H:%M:%S %Z')} |
${role.approval.astimezone(timezone).strftime('%Y-%m-%d %H:%M:%S %Z')} |
+ ${_('Unapproved')} |
${role.role_status} |
${role.role_type} |
diff --git a/fas/fas/templates/master.html b/fas/fas/templates/master.html
index a808d44..3c09e7e 100644
--- a/fas/fas/templates/master.html
+++ b/fas/fas/templates/master.html
@@ -46,7 +46,7 @@
- - about
+ - About
- ${_('My Account')}
- ${_('Log Out')}
- ${_('Log In')}
diff --git a/fas/fas/user.py b/fas/fas/user.py
index d209b68..023ec54 100644
--- a/fas/fas/user.py
+++ b/fas/fas/user.py
@@ -65,7 +65,10 @@ class ValidUsername(validators.FancyValidator):
class UserSave(validators.Schema):
targetname = KnownUser
- human_name = validators.String(not_empty=True, max=42)
+ human_name = validators.All(
+ validators.String(not_empty=True, max=42),
+ validators.Regex(regex='^[^\n:<>]$'),
+ )
#mail = validators.All(
# validators.Email(not_empty=True, strip=True, max=128),
# NonFedoraEmail(not_empty=True, strip=True, max=128),
@@ -81,7 +84,10 @@ class UserCreate(validators.Schema):
validators.String(max=32, min=3),
validators.Regex(regex='^[a-z][a-z0-9]+$'),
)
- human_name = validators.String(not_empty=True, max=42)
+ human_name = validators.All(
+ validators.String(not_empty=True, max=42),
+ validators.Regex(regex='^[^\n:<>]$'),
+ )
email = validators.All(
validators.Email(not_empty=True, strip=True),
NonFedoraEmail(not_empty=True, strip=True),