openrat-cms

commit bef15c1546dff76ae8e126712e2f0a204a160f8a
parent b075c6fd14be9828beec26f5437d14fa410917b1
Author: Tobias Schöne <openbit@schoenesnetz.de>
Date:   Sat, 13 Apr 2013 20:53:02 +0200

set id of enclosing page during generate on included page

Diffstat:
M
model/Page.class.php
 | 
4
+++-
M
model/Value.class.php
 | 
3
+++

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/model/Page.class.php b/model/Page.class.php
@@ -26,6 +26,8 @@
 
 class Page extends Object
 {
+	var $enclosingObjectId = -1;    //Id der Seite in die diese Seite im Rahmen der Generierung eingefügt wird
+						     //Wichtig für include-Values
 	var $pageid;
 	var $templateid;
 	var $template;
@@ -662,7 +664,7 @@ class Page extends Object
 			$val->modelid    = $this->modelid;
 			$val->page       = $this;
 			$val->generate();
-			$val->page       = null;
+			$val->page       = null;			
 			$this->values[$elementid] = $val;
 		}
 	}
diff --git a/model/Value.class.php b/model/Value.class.php
@@ -599,6 +599,7 @@ SQL
 											{
 												case OR_TYPE_PAGE:
 													$p = new Page( $oid );
+													$p->enclosingObjectId = $this->page->id;
 													$p->public         = $this->page->public;
 													$p->up_path        = $this->page->up_path();
 													$p->modelid        = $this->page->modelid;
@@ -619,6 +620,7 @@ SQL
 														if	( $op->isPage )
 														{
 															$p = new Page( $l->linkedObjectId );
+															$p->enclosingObjectId = $this->page->id;
 															$p->public         = $this->page->public;
 															$p->up_path        = $this->page->up_path();
 															$p->modelid        = $this->page->modelid;
@@ -665,6 +667,7 @@ SQL
 								case '':
 								case 'inline':
 									$p = new Page( $objectid );
+									$p->enclosingObjectId = $this->page->id;
 									$p->public         = $this->page->public;
 									$p->up_path        = $this->page->up_path();
 									$p->modelid        = $this->page->modelid;