openrat-cms

commit c343a7031b19f35dd1e98dc5fcb0ad7ddd57996b
parent 86df822364dd5bc90f7c59a8d548781ed108d4e8
Author: Jan Dankert <develop@jandankert.de>
Date:   Tue, 29 Sep 2020 20:25:22 +0200

Cleanup: using the parent infoView()

Diffstat:
modules/cms/action/ObjectAction.class.php
 | 
4
+++-
modules/cms/action/PageAction.class.php
 | 
7
+------

2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/modules/cms/action/ObjectAction.class.php b/modules/cms/action/ObjectAction.class.php
@@ -657,7 +657,9 @@ class ObjectAction extends BaseAction
 		$this->setTemplateVar('size',number_format($this->baseObject->getSize()/1000,0,',','.').' kB' );
 
 		$pad = str_repeat("\xC2\xA0",5); // Hard spaces
-		$this->setTemplateVar('settings', ArrayUtils::dryFlattenArray( $this->baseObject->getTotalSettings(),$pad ) );
+		$totalSettings = $this->baseObject->getTotalSettings();
+		$this->setTemplateVar('total_settings', $totalSettings,$pad );
+		$this->setTemplateVar('settings', ArrayUtils::dryFlattenArray( $totalSettings,$pad ) );
 	}
 
 } 
\ No newline at end of file
diff --git a/modules/cms/action/PageAction.class.php b/modules/cms/action/PageAction.class.php
@@ -340,12 +340,9 @@ class PageAction extends ObjectAction
 	{
 		$this->setTemplateVar('id',$this->page->objectid);
 
-		//$this->page->publisher = new PublishPublic( $this->page->projectid );
+		parent::infoView();
 		$this->page->load();
 
-		if	( $this->page->filename == $this->page->objectid )
-			$this->page->filename = '';
-
 		$this->setTemplateVars( $this->page->getProperties() );
 
         $alias = $this->page->getAliasForLanguage(null);
@@ -382,8 +379,6 @@ class PageAction extends ObjectAction
 		$generator = new PageGenerator( $this->createPageContext( Producer::SCHEME_PUBLIC) );
 
 		$this->setTemplateVar('tmp_filename' ,$generator->getPublicFilename() );
-
-		$this->setTemplateVar('total_settings' ,$this->page->getTotalSettings() );
 	}