@@ -18,12 +18,6 @@ class CMSAdminSectionController extends AdminComponent {
**/
public function controller_global() {
$this->model = $this->current_user->allowed_sections_model;
- if(!$this->current_user->allowed_sections_ids) $this->tree_collection = array("None");
- foreach($this->model->tree() as $section){
- $tmp = str_pad("", $section->get_level(), "*", STR_PAD_LEFT);
- $tmp = str_replace("*", " ", $tmp);
- $this->tree_collection[$section->id] = $tmp.$section->title;
- }
}
/**
@@ -42,15 +36,18 @@ class CMSAdminSectionController extends AdminComponent {
/*new edit function - so include the link, video partials etc*/
public function edit() {
- $this->page = new $this->model_class(WaxUrl::get("id"));
- $files = new WildfireFile();
- $this->all_links = $files->find_all_files();
- $this->link_partial = $this->render_partial("apply_links");
- //parent edit function - this handles the save etc
+ $model = new $this->model_class(WaxUrl::get("id"));
+ $this->possible_parents = array("None");
+ $remove_ids = array();
+ foreach($model->tree() as $section) $remove_ids[] = $section->id; //only the subtree of the current node
+ foreach($this->model->tree() as $section){ //all sections
+ if(!in_array($section->id, $remove_ids)){
+ $tmp = str_pad("", $section->get_level(), "*", STR_PAD_LEFT);
+ $tmp = str_replace("*", " ", $tmp);
+ $this->possible_parents[$section->id] = $tmp.$section->title;
+ }
+ }
parent::edit();
- $this->flash_files = $files->flash_files();
- $this->video_partial = $this->render_partial("apply_video");
- $this->form = $this->render_partial("form");
}
/**
lib/controller/CMSAdminSectionController.php
@@ -14,7 +14,7 @@
<fieldset class="content_options">
<?=medium(text_field($model, "title"))?>
<hr />
- <?=small(select($model, "parent_id", array_diff_key($tree_collection, array($model->primval=>"")), array(), "Parent Section"))?>
+ <?=small(select($model, "parent_id", $possible_parents, array(), "Parent Section"))?>
<?=small(select($model, "default_page_id", options_from_collection($model->published_content, "id", "title", "None"), array(), "Default Content"))?>
<hr />
<?=large(text_area($model, "introduction", array(), "Introduction"))?>
view/CMSAdminSectionController/_form.html
e139e9175134023ace9499bd3ff9a56a33a382d2
Sheldon Els
sheldon.els@gmail.com
http://github.com/phpwax/wildfire/commit/dfcb58da253cbe0eaae3cec203cabce2ceab21a9
dfcb58da253cbe0eaae3cec203cabce2ceab21a9
2009-06-18T10:06:21-07:00
2009-06-18T10:06:21-07:00
sections can't be crazy recursive loops anymore.
e4809692f501270108415f6113528489a045f75b
Sheldon Els
sheldon.els@gmail.com