@@ -113,6 +113,11 @@ public class AccountsResource { | |||||
} else { | } else { | ||||
c.account.update(request); | c.account.update(request); | ||||
} | } | ||||
// check name collision | |||||
final Account byName = accountDAO.findByName(c.account.getName()); | |||||
if (byName != null && !byName.getUuid().equals(c.account.getUuid())) { | |||||
return invalid("err.name.registered"); | |||||
} | |||||
return ok(accountDAO.update(c.account)); | return ok(accountDAO.update(c.account)); | ||||
} | } | ||||
@@ -16,6 +16,18 @@ label_menu_networks_icon=fa fa-cloud | |||||
label_menu_logout=Log out | label_menu_logout=Log out | ||||
label_menu_logout_icon=fa fa-sign-out-alt | label_menu_logout_icon=fa fa-sign-out-alt | ||||
# Profile fields | |||||
field_label_url=URL | |||||
field_label_bio=Bio | |||||
field_label_administrator=Administrator | |||||
field_label_suspended=Suspended | |||||
field_label_auto_update_policy=Auto-Update Policy | |||||
field_label_auto_update_drivers=Automatic Updates for App Drivers | |||||
field_label_auto_update_apps=Automatic Updates for Existing Apps | |||||
field_label_auto_update_app_data=Automatic Updates for App Data for Existing Apps | |||||
field_label_auto_update_new_drivers_and_apps=Automatic Updates for New Drivers and New Apps | |||||
button_label_update_profile=Update | |||||
# Networks table | # Networks table | ||||
loading_networks=Loading bubbles... | loading_networks=Loading bubbles... | ||||
table_title_networks=Bubbles | table_title_networks=Bubbles | ||||
@@ -2,6 +2,12 @@ | |||||
# most of these are referenced on the frontend | # most of these are referenced on the frontend | ||||
msg.global.title=Bubble | msg.global.title=Bubble | ||||
# Truth values | |||||
message_true=True | |||||
message_false=False | |||||
message_null=null | |||||
message_undefined=undefined | |||||
err.name.required=Name is required | err.name.required=Name is required | ||||
err.name.tooShort=Name must be at least 4 characters | err.name.tooShort=Name must be at least 4 characters | ||||
err.name.tooLong=Name cannot be longer than 100 characters | err.name.tooLong=Name cannot be longer than 100 characters | ||||
@@ -1 +1 @@ | |||||
Subproject commit ad0d29e8937e3ac6b319cae4905bfe66e0df966a | |||||
Subproject commit a47aad65e5b5649f84ce0f3e40c165c4ae7dd243 |