openrat-cms

commit 1396efaaf7b6eea8c35f19b8c2d15e1b35b36ac7
parent 2eaea4d22e3143baa529c7e0e7be3a389b32793c
Author: Jan Dankert <devnull@localhost>
Date:   Sat,  3 Nov 2018 03:20:00 +0100

Die Projekteigenschaften werden nicht mehr im Editier-Modus, sondern in den Eigenschaften bearbeitet. Das passt semantisch besser.

Diffstat:
modules/cms-core/action/ProjectAction.class.php
 | 
39
+++++++++++++++++++++++++++++++++++----
modules/cms-core/action/ProjectlistAction.class.php
 | 
6
++++++
modules/cms-core/action/TemplatelistAction.class.php
 | 
9
+--------

3 files changed, 42 insertions(+), 12 deletions(-)
diff --git a/modules/cms-core/action/ProjectAction.class.php b/modules/cms-core/action/ProjectAction.class.php
@@ -32,8 +32,11 @@ use cms\model\Folder;
 class ProjectAction extends Action
 {
 	public $security = SECURITY_ADMIN;
-	
-	var $project;
+
+    /**
+     * @var Project
+     */
+	private $project;
 	var $defaultSubAction = 'listing';
 
 
@@ -50,7 +53,7 @@ class ProjectAction extends Action
 	}
 
 
-	function editPost()
+	function propPost()
 	{
 		if	( $this->getRequestVar('name') != '')
 		{
@@ -80,6 +83,34 @@ class ProjectAction extends Action
 
 
 
+
+	public function editView() {
+
+
+        $list[] = array(
+            'name'=>'content',
+            'type'=>'folder',
+            'id'  => $this->project->getRootObjectId()
+        );
+        $list[] = array(
+            'name'=>'templates',
+            'type'=>'templatelist',
+            'id'  => $this->project->projectid
+        );
+        $list[] = array(
+            'name'=>'languages',
+            'type'=>'languagelist',
+            'id'  => $this->project->projectid
+        );
+        $list[] = array(
+            'name'=>'models',
+            'type'=>'modellist',
+            'id'  => $this->project->projectid
+        );
+
+        $this->setTemplateVar('content',$list);
+    }
+
 	/**
 	 * Liste aller Projekte anzeigen.
 	 *
@@ -130,7 +161,7 @@ class ProjectAction extends Action
 	/**
 	 * Anzeige der Eigenschaften des Projektes.
 	 */
-	function editView()
+	function propView()
 	{
 		$extraProperties = array('rootobjectid'=>$this->project->getRootObjectId());
 		
diff --git a/modules/cms-core/action/ProjectlistAction.class.php b/modules/cms-core/action/ProjectlistAction.class.php
@@ -136,5 +136,11 @@ class ProjectlistAction extends Action
 		$result = Project::getAllLastChanges();
 		$this->setTemplateVar('timeline', $result);
 	}
+
+
+	public function infoView()
+    {
+
+    }
 	
 } 
\ No newline at end of file
diff --git a/modules/cms-core/action/TemplatelistAction.class.php b/modules/cms-core/action/TemplatelistAction.class.php
@@ -50,7 +50,7 @@ class TemplatelistAction extends Action
 
     public function init()
     {
-        $this->project = new Project( $this->request->getProjectId());
+        $this->project = new Project( $this->request->getRequestId());
     }
 
 
@@ -69,13 +69,8 @@ class TemplatelistAction extends Action
 	//
 	function showView()
 	{
-		global $conf_php;
-
 		$list = array();
 
-		$template = new Template();
-		$template->projectid = $this->project->projectid;
-
 		foreach( $this->project->getTemplates() as $id=>$name )
 		{
 			$list[$id] = array();
@@ -83,8 +78,6 @@ class TemplatelistAction extends Action
 			$list[$id]['id'  ] = $id;
 		}
 		
-//		$var['templatemodelid'] = htmlentities( $id   );
-//		$var['text']            = htmlentities( $text );
 		$this->setTemplateVar('templates',$list);
 	}