commit 59bb463967760462192454c7347fd51ebcdc9c1f
parent b6183083ec8db226f266ef09678778b26b97d088
Author: dankert <openrat@jandankert.de>
Date: Sun, 5 Dec 2021 22:26:39 +0100
Fixed a type in template source of new projects.
Diffstat:
4 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/modules/cms/action/page/PageShowAction.class.php b/modules/cms/action/page/PageShowAction.class.php
@@ -26,7 +26,7 @@ class PageShowAction extends PageAction implements Method {
$pageContext = $this->createPageContext( Producer::SCHEME_PREVIEW );
// HTTP-Header mit Sprachinformation setzen.
- $language = new Language( $pageContext->languageid);
+ $language = new Language( $pageContext->languageId);
$language->load();
header('Content-Language: '.$language->isoCode);
diff --git a/modules/cms/generator/PageGenerator.class.php b/modules/cms/generator/PageGenerator.class.php
@@ -36,16 +36,17 @@ class PageGenerator extends BaseGenerator
/**
* Erzeugen der Inhalte zu allen Elementen dieser Seite
- * wird von generate() aufgerufen
+ * wird von generate() aufgerufen.
+
+ * @param $page Page page
+ * @return array
+ * @throws GeneratorException
*/
protected function generatePageElements( $page )
{
$values = array();
- //if ( $this->publisher->isSimplePreview() )
- // $elements = $this->getWritableElements();
- //else
- $elements = $page->getElements();
+ $elements = $page->getTemplate()->getElements();
foreach( $elements as $elementid=>$element )
{
diff --git a/modules/cms/model/PageContent.class.php b/modules/cms/model/PageContent.class.php
@@ -116,15 +116,15 @@ SQL
$stmt = DB::sql( <<<SQL
INSERT INTO {{pagecontent}}
- (id ,contentid ,elementid ,pageid ,languageid )
- VALUES ({valueid},{contentid},{elementid},{pageid},{languageid} )
+ (id ,contentid ,elementid ,pageid ,languageid )
+ VALUES ({id},{contentid},{elementid},{pageid},{languageid} )
SQL
);
- $stmt->setInt( 'valueid' ,$this->valueid );
- $stmt->setInt( 'contentid' ,$this->contentId );
- $stmt->setInt( 'elementid' ,$this->elementId );
- $stmt->setInt( 'pageid' ,$this->pageid );
- $stmt->setInt( 'languageid',$this->languageid );
+ $stmt->setInt( 'id' ,$this->id );
+ $stmt->setInt( 'contentid' ,$this->contentId );
+ $stmt->setInt( 'elementid' ,$this->elementId );
+ $stmt->setInt( 'pageid' ,$this->pageId );
+ $stmt->setInt( 'languageid',$this->languageid );
$stmt->execute();
}
diff --git a/modules/cms/model/Project.class.php b/modules/cms/model/Project.class.php
@@ -364,15 +364,17 @@ SQL
$element = new Element();
$element->templateid = $template->templateid;
- $element->typeid = Element::ELEMENT_TYPE_TEXT;
- $element->label = 'Text';
- $element->name = 'text';
+ $element->typeid = Element::ELEMENT_TYPE_TEXT;
+ $element->writable = true;
+ $element->format = Element::ELEMENT_FORMAT_MARKDOWN;
+ $element->label = 'Text';
+ $element->name = 'text';
$element->persist();
// Template anlegen
$templateModel = $template->loadTemplateModelFor( $model->modelid );
$templateModel->extension = 'html';
- $templateModel->src = '<html><body><h1>Sample page</h1><hr><p>Text: {{name}</p></body></html>';
+ $templateModel->src = '<html><body><h1>Sample page</h1><hr><p>Text: {{text}}</p></body></html>';
$templateModel->persist();
// Beispiel-Seite anlegen
