openrat-cms

commit 36df6ef54de32f8069a20df8fb74022ea62cbf72
parent c1df0efc29420e9834c85db2ad5eae252595771c
Author: Jan Dankert <devnull@localhost>
Date:   Sun, 14 Apr 2013 11:09:11 +0200

Zusammenführung.

Diffstat:
build.ini
 | 
8
++++----
model/Page.class.php
 | 
4
+++-
model/Value.class.php
 | 
3
+++
themes/default/templates/search/edit.tpl.src.xml
 | 
52
++++++++++++++++++++++++++++++++++++++++++++++++++++

4 files changed, 62 insertions(+), 5 deletions(-)
diff --git a/build.ini b/build.ini
@@ -1,5 +1,5 @@
 ; auto-generated by /home/dankert/bin/openrat-increment-build - do not change
-build=945
-date="Thu, 21 Mar 2013 20:34:22 +0100"
-message="Kennwortänderung ist nur erlaubt, wenn das Login über die interne Datenbank geschah."
-changeset=22bb6a443a2e
+build=946
+date="Mon, 08 Apr 2013 21:26:51 +0200"
+message="Erste Version dieser dynamischen Klasse (Funktion ist noch ungetestet)."
+changeset=61e0740b1a40
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;
diff --git a/themes/default/templates/search/edit.tpl.src.xml b/themes/default/templates/search/edit.tpl.src.xml
@@ -0,0 +1,51 @@
+<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.openrat.de/template ../template.xsd">
+	<form method="GET" subaction="result">
+		<part class="line">
+			<part class="label">
+				<label for="value">
+					<text key="value"></text>
+				</label>
+				<newline></newline>
+			</part>
+			<part class="input">
+				<input name="text" hint="message:search"></input>
+			</part>
+		</part>
+		<part class="line">
+			<part class="label">
+				<label for="value">
+					<text key="filter"></text>
+				</label>
+				<newline></newline>
+			</part>
+			<part class="input">
+				<checkbox name="id" default="config:search/quicksearch/flag/id" />
+				<label for="id">
+					<text key="id"></text>
+				</label>
+				<newline />
+				<checkbox name="name" default="config:search/quicksearch/flag/name" />
+				<label for="name">
+					<text key="name"></text>
+				</label>
+				<newline />
+				<checkbox name="filename" default="config:search/quicksearch/flag/filename" />
+				<label for="filename">
+					<text key="filename"></text>
+				</label>
+				<newline />
+				<checkbox name="description" default="config:search/quicksearch/flag/description" />
+				<label for="description">
+					<text key="description"></text>
+				</label>
+				<newline />
+				<checkbox name="content" default="config:search/quicksearch/flag/content" />
+				<label for="content">
+					<text key="content"></text>
+				</label>
+			</part>
+		</part>
+
+	</form>
+</output>+
\ No newline at end of file