summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-07-20 15:21:44 -0700
committerBharat Mediratta <bharat@menalto.com>2010-07-20 15:21:44 -0700
commite5b1a4fc23bb31645cc330085db9a98f5e6d06a6 (patch)
tree593ddd40448b10f9f29828068888ad355096ee58 /modules
parent189518849c8a1d8f5ee7c3a1ddbe0852bdbe822c (diff)
Fix a bunch of missing or invalid error messages. Fixes ticket #1232.
Diffstat (limited to 'modules')
-rw-r--r--modules/user/controllers/admin_users.php11
1 files changed, 7 insertions, 4 deletions
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 670ec271..6178d25f 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -281,7 +281,8 @@ class Admin_Users_Controller extends Admin_Controller {
"admin/users/edit_user/$user->id", "", "post", array("id" => "g-edit-user-form"));
$group = $form->group("edit_user")->label(t("Edit user"));
$group->input("name")->label(t("Username"))->id("g-username")->value($user->name)
- ->error_messages("conflict", t("There is already a user with that username"));
+ ->error_messages("conflict", t("There is already a user with that username"))
+ ->error_messages("length", t("This name is too long"));
$group->input("full_name")->label(t("Full name"))->id("g-fullname")->value($user->full_name)
->error_messages("length", t("This name is too long"));
$group->password("password")->label(t("Password"))->id("g-password")
@@ -370,11 +371,13 @@ class Admin_Users_Controller extends Admin_Controller {
private function _get_group_edit_form_admin($group) {
$form = new Forge("admin/users/edit_group/$group->id", "", "post", array("id" => "g-edit-group-form"));
$form_group = $form->group("edit_group")->label(t("Edit group"));
- $form_group->input("name")->label(t("Name"))->id("g-name")->value($group->name);
+ $form_group->input("name")->label(t("Name"))->id("g-name")->value($group->name)
+ ->error_messages("required", t("A name is required"));
$form_group->inputs["name"]->error_messages("conflict", t("There is already a group with that name"))
->error_messages("required", t("You must enter a group name"))
- ->error_messages("length", t("The group name must be at least %min_length characters",
- array("min_length" => 4)));
+ ->error_messages("length",
+ t("The group name must be between %min_length and %max_length characters",
+ array("min_length" => 4, "max_length" => 255)));
$form_group->submit("")->value(t("Save"));
return $form;
}