diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-12-25 12:39:09 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-12-25 12:39:09 -0800 |
| commit | c50c2d135c5e769e8904e5dc766d27bcd4a1d8b3 (patch) | |
| tree | d6a5a7883bbebf9d4b12ae1ef3d7219ff3aa26c9 | |
| parent | 73aeed890263386a0cd44b210ddf360dc6613843 (diff) | |
Fix uses of count_records() and use ORM to count instead.
| -rw-r--r-- | modules/server_add/controllers/server_add.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php index 77487673..6ff00812 100644 --- a/modules/server_add/controllers/server_add.php +++ b/modules/server_add/controllers/server_add.php @@ -175,15 +175,15 @@ class Server_Add_Controller extends Admin_Controller { // over 10% in percent_complete. $task->set("queue", $queue); $task->percent_complete = min($task->percent_complete + 0.1, 10); - $task->status = t2("Found one file", "Found %count files", - db::build()->count_records( - "server_add_files", array("task_id" => $task->id))); + $task->status = t2( + "Found one file", "Found %count files", + ORM::factory("server_add_file")->where("task_id", "=", $task->id)->count_all()); if (!$queue) { $task->set("mode", "add-files"); $task->set( - "total_files", db::build()->count_records( - "server_add_files", array("task_id" => $task->id))); + "total_files", + ORM::factory("server_add_file")->where("task_id", "=", $task->id)->count_all()); $task->percent_complete = 10; } break; @@ -256,7 +256,7 @@ class Server_Add_Controller extends Admin_Controller { $task->status = t("Adding photos / albums (%completed of %total)", array("completed" => $completed_files, "total" => $total_files)); - $task->percent_complete = 10 + 100 * ($completed_files / $total_files); + $task->percent_complete = $total_files ? 10 + 100 * ($completed_files / $total_files) : 100; break; case "done": |