commit e4fc155de75f239f755b9dab7951f53fd71a08c7
parent 69cb7c554c1c1159dc78029fdab4acfe0b506dd1
Author: Jan Dankert <devnull@localhost>
Date: Fri, 9 Feb 2018 01:03:56 +0100
Die Project-Id muss an die Listen-Actions weitergeleitet werden. Die Project-Id darf nicht mehr aus der Sitzung ermittelt werden.
Diffstat:
6 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/modules/cms-core/action/LanguagelistAction.class.php b/modules/cms-core/action/LanguagelistAction.class.php
@@ -5,7 +5,7 @@ namespace cms\action;
use cms\model\Language;
-
+use cms\model\Project;
use Session;
use \Html;
@@ -36,16 +36,21 @@ use \Html;
class LanguagelistAction extends Action
{
public $security = SECURITY_USER;
-
- /**
+ /**
+ * @var Project
+ */
+ private $project;
+
+
+ /**
* Konstruktor
*/
function __construct()
{
parent::__construct();
- $this->project = Session::getProject();
+ $this->project = new Project( $this->request->getProjectId());
}
diff --git a/modules/cms-core/action/ModellistAction.class.php b/modules/cms-core/action/ModellistAction.class.php
@@ -3,6 +3,7 @@
namespace cms\action;
use cms\model\Model;
+use cms\model\Project;
use Html;
use Session;
@@ -39,19 +40,16 @@ class ModellistAction extends Action
public $security = SECURITY_USER;
+ /**
+ * @var Project
+ */
private $project;
function __construct()
{
parent::__construct();
- if ( $this->getRequestId() != 0 )
- {
- $this->model = new Model( $this->getRequestId() );
- $this->model->load();
- }
-
- $this->project = Session::getProject();
+ $this->project = new Project( $this->request->getProjectId() );
}
diff --git a/modules/cms-core/action/RequestParams.class.php b/modules/cms-core/action/RequestParams.class.php
@@ -165,5 +165,9 @@ namespace cms\action {
{
return $this->getRequestVar(REQ_PARAM_MODEL_ID,OR_FILTER_NUMBER);
}
+ public function getProjectId()
+ {
+ return $this->getRequestVar(REQ_PARAM_PROJECT_ID,OR_FILTER_NUMBER);
+ }
}
}
\ No newline at end of file
diff --git a/modules/cms-core/action/TemplatelistAction.class.php b/modules/cms-core/action/TemplatelistAction.class.php
@@ -3,6 +3,7 @@
namespace cms\action;
use cms\model\Element;
+use cms\model\Project;
use cms\model\Template;
use Session;
@@ -59,10 +60,12 @@ class TemplatelistAction extends Action
$list = array();
+ $project = new Project( $this->request->getProjectId());
+
$template = new Template();
$template->projectid = $this->getRequestId();
- foreach( $template::getAll() as $id=>$name )
+ foreach( $project->getTemplates() as $id=>$name )
{
$list[$id] = array();
$list[$id]['name'] = $name;
diff --git a/modules/cms-core/model/Template.class.php b/modules/cms-core/model/Template.class.php
@@ -82,7 +82,7 @@ class Template
/**
* Ermitteln aller Templates in dem aktuellen Projekt.
* @return Array mit Id:Name
- * @deprecated use Project::getLanguages()
+ * @deprecated use Project::getTemplates()
*/
function getAll()
{
diff --git a/modules/util/AdministrationTree.class.php b/modules/util/AdministrationTree.class.php
@@ -213,7 +213,8 @@ class AdministrationTree extends AbstractTree
// Templates
$treeElement = new TreeElement();
$treeElement->id = $projectid;
- $treeElement->internalId = $projectid;
+ $treeElement->extraId[REQ_PARAM_PROJECT_ID] = $projectid;
+ $treeElement->internalId = $projectid;
$treeElement->text = lang('GLOBAL_TEMPLATES');
// $treeElement->url = Html::url('template','listing',0,array(REQ_PARAM_TARGETSUBACTION=>'listing',REQ_PARAM_TARGET=>'content'));
$treeElement->description= lang('GLOBAL_TEMPLATES_DESC');
@@ -229,6 +230,7 @@ class AdministrationTree extends AbstractTree
$treeElement = new TreeElement();
$treeElement->description= '';
$treeElement->id = $projectid;
+ $treeElement->extraId[REQ_PARAM_PROJECT_ID] = $projectid;
$treeElement->internalId = $projectid;
$treeElement->action = 'languagelist';
$treeElement->text = lang('GLOBAL_LANGUAGES');
@@ -254,6 +256,7 @@ class AdministrationTree extends AbstractTree
$treeElement->id = $projectid;
$treeElement->internalId = $projectid;
+ $treeElement->extraId[REQ_PARAM_PROJECT_ID] = $projectid;
$treeElement->description= lang('GLOBAL_MODELS_DESC');
$treeElement->text = lang('GLOBAL_MODELS');
// $treeElement->url = Html::url('model','listing',0,array(REQ_PARAM_TARGETSUBACTION=>'listing',REQ_PARAM_TARGET=>'content'));
@@ -275,6 +278,7 @@ class AdministrationTree extends AbstractTree
$treeElement = new TreeElement();
$treeElement->id = $projectid;
$treeElement->internalId = $projectid;
+ $treeElement->extraId[REQ_PARAM_PROJECT_ID] = $projectid;
$treeElement->text = lang('GLOBAL_SEARCH');
// $treeElement->url = Html::url('search','',0,array(REQ_PARAM_TARGET=>'content'));
$treeElement->action = 'search';