Separate GET and POST in Group Administration

2 files changed, 49 insertions, 38 deletions

diff --git a/modules/user/controllers/admin_groups.php b/modules/user/controllers/admin_groups.php
index 7fdbb0dc..e5043e99 100644
--- a/modules/user/controllers/admin_groups.php
+++ b/modules/user/controllers/admin_groups.php
@@ -26,62 +26,73 @@ class Admin_Groups_Controller extends Controller {
   }
 
   public function create() {
+    rest::http_content_type(rest::JSON);
     $form = group::get_add_form_admin();
-    if (request::method() =="post" ) {
-      if($form->validate()) {
-        $group = group::create($form->add_group->inputs["name"]->value);
-        $group->save();
-        message::success(sprintf(_("Created group %s"), $group->name));
-        print json_encode(array("result" => "success"));
-      } else {
-        message::error(_("Failed to create group"));
-        print json_encode(array("result" => "error",
-                                "form" => $form->__toString()));
-      }
+    if($form->validate()) {
+      $group = group::create($form->add_group->inputs["name"]->value);
+      $group->save();
+      message::success(sprintf(_("Created group %s"), $group->name));
+      print json_encode(array("result" => "success"));
     } else {
-      print $form;
-    }    
+      message::error(_("Failed to create group"));
+      print json_encode(array("result" => "error",
+                              "form" => $form->__toString()));
+    }
   }
 
+  public function create_form() {
+    print group::get_add_form_admin();
+  }
+  
   public function delete($id) {
+    rest::http_content_type(rest::JSON);
     $group = ORM::factory("group", $id);
     if (!$group->loaded) {
       kohana::show_404();
     }
 
-    if (request::method() == "post" ) {
-      $name = $group->name;
-      $group->delete();
-
-      log::success("group", sprintf(_("Deleted group %s"), $name));
-      message::success(sprintf(_("Deleted group %s"), $name));
-      print json_encode(array("result" => "success"));
-    } else {
-      print group::get_delete_form_admin($group);
-    }
+    $name = $group->name;
+    $group->delete();
 
+    log::success("group", sprintf(_("Deleted group %s"), $name));
+    message::success(sprintf(_("Deleted group %s"), $name));
+    print json_encode(array("result" => "success"));
   }
 
+  public function delete_form($id) {
+    $group = ORM::factory("group", $id);
+    if (!$group->loaded) {
+      kohana::show_404();
+    }
+    print group::get_delete_form_admin($group);
+  }
+  
   public function edit($id) {
+    rest::http_content_type(rest::JSON);
     $group = ORM::factory("group", $id);
     if (!$group->loaded) {
       kohana::show_404();
     }
 
     $form = group::get_edit_form_admin($group);
-    if (request::method() =="post" ) {
-      if($form->validate()) {
-        $group->name = $form->edit_group->inputs["name"]->value;
-        $group->save();
-        message::success(sprintf(_("Changed group %s"), $group->name));
-        print json_encode(array("result" => "success"));
-      } else {
-        message::error(sprintf(_("Failed to change group %s"), $group->name));
-        print json_encode(array("result" => "error",
-                                "form" => $form->__toString()));
-      }
+    if($form->validate()) {
+      $group->name = $form->edit_group->inputs["name"]->value;
+      $group->save();
+      message::success(sprintf(_("Changed group %s"), $group->name));
+      print json_encode(array("result" => "success"));
     } else {
-      print $form;
+      message::error(sprintf(_("Failed to change group %s"), $group->name));
+      print json_encode(array("result" => "error",
+                              "form" => $form->__toString()));
     }
   }
+  
+  public function edit_form($id) {
+    $group = ORM::factory("group", $id);
+    if (!$group->loaded) {
+      kohana::show_404();
+    }
+
+    print group::get_edit_form_admin($group);
+  }
 }
diff --git a/modules/user/views/admin_groups.html.php b/modules/user/views/admin_groups.html.php
index 5b4b52e4..17f350d2 100644
--- a/modules/user/views/admin_groups.html.php
+++ b/modules/user/views/admin_groups.html.php
@@ -8,13 +8,13 @@
     <? foreach ($groups as $i => $group): ?>

     <li>

       <?= $group->name ?>

-      <a href="groups/edit/<?= $group->id ?>" class="gDialogLink">edit</a>

+      <a href="groups/edit_form/<?= $group->id ?>" class="gDialogLink">edit</a>

       <? if (!$group->special): ?>

-        <a href="groups/delete/<?= $group->id ?>" class="gDialogLink">delete</a>

+        <a href="groups/delete_form/<?= $group->id ?>" class="gDialogLink">delete</a>

       <? endif ?>

     </li>

     <? endforeach ?>

-    <li><a href="groups/create" class="gDialogLink">Add group</a></li>

+    <li><a href="groups/create_form" class="gDialogLink">Add group</a></li>

   </ul>

 </div>