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

Get rid of the rearrange helper as the code could be inlined

Browse Source
This commit is contained in:
Tim Almdal
2008-12-04 06:36:14 +00:00
parent b9a0843d86
commit 1ae3ed7e3b
3 changed files with 13 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/controllers/welcome.php
View File

@@ -36,7 +36,7 @@ class Welcome_Controller extends Template_Controller {
$this->template->deepest_photo = ORM::factory("item")
->where("type", "photo")->orderby("level", "desc")->find();
$this->template->album_tree = $this->_load_album_tree();
$this->template->rearrange_html = rearrange::get_html()->render();
$this->template->rearrange_html = new View("rearrange.html");
} catch (Exception $e) {
$this->template->album_count = 0;
$this->template->photo_count = 0;

13
modules/rearrange/controllers/rearrange.php
View File

@@ -20,6 +20,17 @@
class Rearrange_Controller extends Controller {
public function show($id=null) {
print rearrange::get_children($id)->render();
$view = new View("rearrange_item_list.html");
$view->root = null;
if (empty($id)) {
$item = ORM::factory("item", 1);
$view->children = array($item);
} else {
$item = ORM::factory("item", $id);
$view->children = $item->children();
}
print $view;
}
}

40
modules/rearrange/helpers/rearrange.php
View File

@@ -1,40 +0,0 @@
<?php defined("SYSPATH") or die("No direct script access.");
/**
* Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2008 Bharat Mediratta
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class rearrange_Core {
public static function get_html() {
return new View("rearrange.html");
}
public static function get_children($id=null) {
$view = new View("rearrange_item_list.html");
$view->root = null;
if (empty($id)) {
$item = ORM::factory("item", 1);
$view->children = array($item);
} else {
$item = ORM::factory("item", $id);
$view->children = $item->children();
}
return $view;
}
}