stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-20 19:39:16 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Put up an error if you rename a user to an already existing name.

Browse Source
This commit is contained in:
Bharat Mediratta
2009-01-06 10:05:08 +00:00
parent b21215d2e6
commit 4ee24a6645
4 changed files with 62 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
modules/user/controllers/admin_groups.php
View File

@@ -27,8 +27,18 @@ class Admin_Groups_Controller extends Controller {
public function add() {
$form = group::get_add_form_admin();
if($form->validate()) {
$group = group::create($form->add_group->inputs["name"]->value);
$valid = $form->validate();
if ($valid) {
$new_name = $form->add_group->inputs["name"]->value;
$group = ORM::factory("group")->where("name", $new_name)->find();
if ($group->loaded) {
$form->add_group->inputs["name"]->add_error("in_use", 1);
$valid = false;
}
}
if ($valid) {
$group = group::create($new_name);
$group->save();
message::success(sprintf(_("Created group %s"), $group->name));
print json_encode(array("result" => "success"));
@@ -42,7 +52,7 @@ class Admin_Groups_Controller extends Controller {
public function add_form() {
print group::get_add_form_admin();
}
public function delete($id) {
$group = ORM::factory("group", $id);
if (!$group->loaded) {
@@ -71,7 +81,7 @@ class Admin_Groups_Controller extends Controller {
}
print group::get_delete_form_admin($group);
}
public function edit($id) {
$group = ORM::factory("group", $id);
if (!$group->loaded) {
@@ -79,7 +89,18 @@ class Admin_Groups_Controller extends Controller {
}
$form = group::get_edit_form_admin($group);
if($form->validate()) {
$valid = $form->validate();
if ($valid) {
$new_name = $form->edit_group->inputs["name"]->value;
$group = ORM::factory("group")->where("name", $new_name)->find();
if ($group->loaded) {
$form->edit_group->inputs["name"]->add_error("in_use", 1);
$valid = false;
}
}
if ($valid) {
$group->name = $form->edit_group->inputs["name"]->value;
$group->save();
message::success(sprintf(_("Changed group %s"), $group->name));
@@ -90,7 +111,7 @@ class Admin_Groups_Controller extends Controller {
"form" => $form->__toString()));
}
}
public function edit_form($id) {
$group = ORM::factory("group", $id);
if (!$group->loaded) {