public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Convert the developer module to the new json::reply helper.

Browse Source
This commit is contained in:
Tim Almdal 2010-07-26 10:46:52 -07:00
parent cce12b602c
commit 95757edaa1
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/developer/controllers/admin_developer.php
View File

@ -68,7 +68,7 @@ class Admin_Developer_Controller extends Admin_Controller {
$task_context = array("step" => 0, "success_msg" => $success_msg, "error_msg" => $error_msg); $task_context = array("step" => 0, "success_msg" => $success_msg, "error_msg" => $error_msg);
$task = task::create($task_def, array_merge($task_context, $post->as_array())); $task = task::create($task_def, array_merge($task_context, $post->as_array()));
print json_encode(array("result" => "started", json::reply(array("result" => "started",
"max_iterations" => 15, "max_iterations" => 15,
"url" => url::site("admin/developer/run_task/{$task->id}?csrf=" . "url" => url::site("admin/developer/run_task/{$task->id}?csrf=" .
access::csrf_token()), access::csrf_token()),
@ -76,7 +76,7 @@ class Admin_Developer_Controller extends Admin_Controller {
} else { } else {
$v = $this->_get_module_create_content(arr::overwrite($form, $post->as_array()), $v = $this->_get_module_create_content(arr::overwrite($form, $post->as_array()),
arr::overwrite($errors, $post->errors())); arr::overwrite($errors, $post->errors()));
print json_encode(array("result" => "error", json::reply(array("result" => "error",
"form" => $v->__toString())); "form" => $v->__toString()));
} }
} }
@ -119,7 +119,7 @@ class Admin_Developer_Controller extends Admin_Controller {
"comments" => $post->comments, "tags" => $post->tags)); "comments" => $post->comments, "tags" => $post->tags));
batch::start(); batch::start();
print json_encode(array("result" => "started", json::reply(array("result" => "started",
"max_iterations" => $total + 5, "max_iterations" => $total + 5,
"url" => url::site("admin/developer/run_task/{$task->id}?csrf=" . "url" => url::site("admin/developer/run_task/{$task->id}?csrf=" .
access::csrf_token()), access::csrf_token()),
@ -127,7 +127,7 @@ class Admin_Developer_Controller extends Admin_Controller {
} else { } else {
$v = $this->_get_test_data_view(arr::overwrite($form, $post->as_array()), $v = $this->_get_test_data_view(arr::overwrite($form, $post->as_array()),
arr::overwrite($errors, $post->errors())); arr::overwrite($errors, $post->errors()));
print json_encode(array("result" => "error", json::reply(array("result" => "error",
"form" => $v->__toString())); "form" => $v->__toString()));
} }
} }
@ -152,11 +152,11 @@ class Admin_Developer_Controller extends Admin_Controller {
message::success(empty($error_msg) ? $context["error_msg"] : $error_msg); message::success(empty($error_msg) ? $context["error_msg"] : $error_msg);
break; break;
} }
print json_encode(array("result" => "success", json::reply(array("result" => "success",
"task" => $task->as_array())); "task" => $task->as_array()));
} else { } else {
print json_encode(array("result" => "in_progress", json::reply(array("result" => "in_progress",
"task" => $task->as_array())); "task" => $task->as_array()));
} }
} }

8
modules/developer/views/controller.txt.php
View File

@ -32,15 +32,15 @@ class <?= $class_name ?>_Controller extends Controller {
message::success(t("<?= $name ?> Processing Successfully")); message::success(t("<?= $name ?> Processing Successfully"));
print json_encode( json::reply(
array("result" => "success")); array("result" => "success"));
} else { } else {
print json_encode( json::reply(
array("result" => "error", array("result" => "error",
"form" => $form->__toString())); "form" => $form->__toString()));
} }
} }
private function _get_form() { private function _get_form() {
$form = new Forge("<?= $module ?>/handler", "", "post", $form = new Forge("<?= $module ?>/handler", "", "post",
array("id" => "g-<?= $css_id ?>-form")); array("id" => "g-<?= $css_id ?>-form"));
@ -50,4 +50,4 @@ class <?= $class_name ?>_Controller extends Controller {
return $form; return $form;
} }
} }