Fully implement the user administration backend with drag/drop to add

users to groups.

3 files changed, 11 insertions, 18 deletions

diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index 45c8d1e8..56e8b52d 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -62,7 +62,7 @@ class group_Core {
   }
 
   static function get_edit_form_admin($group) {
-    $form = new Forge("admin/groups/edit/$group->id", "", "post", array("id" => "gEditGroupForm"));
+    $form = new Forge("admin/users/edit_group/$group->id", "", "post", array("id" => "gEditGroupForm"));
     $form_group = $form->group("edit_group")->label(t("Edit Group"));
     $form_group->input("name")->label(t("Name"))->id("gName")->value($group->name);
     $form_group->inputs["name"]->error_messages(
@@ -73,7 +73,7 @@ class group_Core {
   }
 
   static function get_add_form_admin() {
-    $form = new Forge("admin/groups/add", "", "post", array("id" => "gAddGroupForm"));
+    $form = new Forge("admin/users/add_group", "", "post", array("id" => "gAddGroupForm"));
     $form_group = $form->group("add_group")->label(t("Add Group"));
     $form_group->input("name")->label(t("Name"))->id("gName");
     $form_group->inputs["name"]->error_messages(
@@ -85,7 +85,7 @@ class group_Core {
   }
 
   static function get_delete_form_admin($group) {
-    $form = new Forge("admin/groups/delete/$group->id", "", "post",
+    $form = new Forge("admin/users/delete_group/$group->id", "", "post",
                       array("id" => "gDeleteGroupForm"));
     $form_group = $form->group("delete_group")->label(
       t("Are you sure you want to delete group %group_name?", array("group_name" => $group->name)));
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index b67986e3..14e3f09c 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -38,7 +38,8 @@ class user_Core {
   }
 
   static function get_edit_form_admin($user) {
-    $form = new Forge("admin/users/edit/$user->id", "", "post", array("id" => "gEditUserForm"));
+    $form = new Forge(
+      "admin/users/edit_user/$user->id", "", "post", array("id" => "gEditUserForm"));
     $group = $form->group("edit_user")->label(t("Edit User"));
     $group->input("name")->label(t("Name"))->id("gName")->value($user->name);
     $group->inputs["name"]->error_messages(
@@ -69,7 +70,7 @@ class user_Core {
   }
 
   static function get_delete_form_admin($user) {
-    $form = new Forge("admin/users/delete/$user->id", "", "post", array("id" => "gDeleteUserForm"));
+    $form = new Forge("admin/users/delete_user/$user->id", "", "post", array("id" => "gDeleteUserForm"));
     $group = $form->group("delete_user")->label(
       t("Are you sure you want to delete user %name?", array("name" => $user->name)));
     $group->submit("")->value(t("Delete user %name", array("name" => $user->name)));
diff --git a/modules/user/helpers/user_menu.php b/modules/user/helpers/user_menu.php
index 5f845804..7a0a4505 100644
--- a/modules/user/helpers/user_menu.php
+++ b/modules/user/helpers/user_menu.php
@@ -19,18 +19,10 @@
  */
 class user_menu_Core {
   static function admin($menu, $theme) {
-    $menu->get("users_groups_menu")
-      ->append(Menu::factory("link")
-               ->id("list_users")
-               ->label(t("Users"))
-               ->url(url::site("admin/users")))
-      ->append(Menu::factory("link")
-               ->id("list_groups")
-               ->label(t("Groups"))
-               ->url(url::site("admin/groups")))
-      ->append(Menu::factory("link")
-               ->id("users_groups")
-               ->label(t("Users <-> Groups"))
-               ->url("#"));
+    $menu->add_after("presentation_menu",
+                     Menu::factory("link")
+                     ->id("users_groups")
+                     ->label(t("Users/Groups"))
+                     ->url(url::site("admin/users")));
   }
 }