From c7193f9b2ede6ed913d16a9a8047b6867b8afada Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Wed, 24 Dec 2008 04:22:22 +0000 Subject: Normalize our Admin controllers so that functions always print out their results, as opposed to having them return their view back upstream. This is a little more code in every controller, but it's much less magical and more consistent. Look up the active_theme and active_admin_theme inside the view itself, no need to do that in the controllers. This makes view initialization easier in the controllers. --- modules/watermark/controllers/admin_watermarks.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'modules/watermark/controllers') diff --git a/modules/watermark/controllers/admin_watermarks.php b/modules/watermark/controllers/admin_watermarks.php index 972e506e..469f14fe 100644 --- a/modules/watermark/controllers/admin_watermarks.php +++ b/modules/watermark/controllers/admin_watermarks.php @@ -41,17 +41,19 @@ class Admin_Watermarks_Controller extends Admin_Controller { $watermark->height = $image_info[1]; $watermark->mime_type = $image_info["mime"]; $watermark->save(); + message::add(_("Watermark saved")); - url::redirect("admin/watermarks"); + response::redirect("admin/watermarks"); } } @unlink($file); } - $view = new View("admin_watermarks.html"); - $view->watermarks = ORM::factory("watermark")->find_all(); - $view->form = watermark::get_watermark_form(); - return $view; + $view = new Admin_View("admin.html"); + $view->content = new View("admin_watermarks.html"); + $view->content->watermarks = ORM::factory("watermark")->find_all(); + $view->content->form = watermark::get_watermark_form(); + print $view; } public function get_form($user_id) { -- cgit v1.2.3