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

Fix for ticket #1181. Use $.getJSON to retrieve the json contents of the dialog. Convert all the controllers

Browse Source 
that create the data to go into a dialog to return the html as part of a json object.
This commit is contained in:
Tim Almdal
2010-07-06 14:12:00 -07:00
parent 9d66783f47
commit dbf3199e46
23 changed files with 62 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/user/controllers/admin_users.php
View File

@@ -61,7 +61,7 @@ class Admin_Users_Controller extends Admin_Controller {
}
public function add_user_form() {
print $this->_get_user_add_form_admin();
print json_encode(array("form" => (string) $this->_get_user_add_form_admin()));
}
public function delete_user($id) {
@@ -95,7 +95,7 @@ class Admin_Users_Controller extends Admin_Controller {
if (empty($user)) {
throw new Kohana_404_Exception();
}
print $this->_get_user_delete_form_admin($user);
print json_encode(array("form" => (string) $this->_get_user_delete_form_admin($user)));
}
public function edit_user($id) {
@@ -146,7 +146,7 @@ class Admin_Users_Controller extends Admin_Controller {
throw new Kohana_404_Exception();
}
print $this->_get_user_edit_form_admin($user);
print json_encode(array("form" => (string) $this->_get_user_edit_form_admin($user)));
}
public function add_user_to_group($user_id, $group_id) {
@@ -199,7 +199,7 @@ class Admin_Users_Controller extends Admin_Controller {
}
public function add_group_form() {
print $this->_get_group_add_form_admin();
print json_encode(array("form" => (string) $this->_get_group_add_form_admin()));
}
public function delete_group($id) {
@@ -230,7 +230,7 @@ class Admin_Users_Controller extends Admin_Controller {
throw new Kohana_404_Exception();
}
print $this->_get_group_delete_form_admin($group);
print json_encode(array("form" => (string) $this->_get_group_delete_form_admin($group)));
}
public function edit_group($id) {
@@ -272,7 +272,7 @@ class Admin_Users_Controller extends Admin_Controller {
throw new Kohana_404_Exception();
}
print $this->_get_group_edit_form_admin($group);
print json_encode(array("form" => (string) $this->_get_group_edit_form_admin($group)));
}
/* User Form Definitions */