commit 1670fd53a2b0f7c07e3fac8d111ede783172c038
parent 456e6f847637030d6f673a192228f9990ea72ed5
Author: dankert <devnull@localhost>
Date: Tue, 31 Mar 2009 23:16:35 +0200
Bugfix: Projekt in Sitzung korrekt initialisieren.
Diffstat:
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/actionClasses/IndexAction.class.php b/actionClasses/IndexAction.class.php
@@ -652,7 +652,7 @@ class IndexAction extends Action
$object = Session::getObject();
// Falls noch kein Objekt ausgew�hlt, dann das zuletzt ge�nderte benutzen.
if ( !is_object($object) && @$conf['login']['start']['start_lastchanged_object'] )
- {
+ {
$objectid = Value::getLastChangedObjectByUserId($user->userid);
if ( Object::available($objectid))
{
@@ -878,7 +878,7 @@ class IndexAction extends Action
Session::setObject( $object );
$project = new Project( $object->projectid );
- $project->load();
+ $project->load();
Session::setProject( $project );
$language = new Language( isset($vars[REQ_PARAM_LANGUAGE_ID])&&Language::available($vars[REQ_PARAM_LANGUAGE_ID])?$vars[REQ_PARAM_LANGUAGE_ID]:$project->getDefaultLanguageId() );
@@ -1069,22 +1069,26 @@ class IndexAction extends Action
if ( $projectid != 0 )
{
- $project = new Project( $projectid );
+ $project = new Project( $projectid );
+ $project->load();
Session::setProject($project);
}
elseif ( $languageid != 0 )
{
- $language = new Language( $languageid );
+ $language = new Language( $languageid );
+ $language->load();
Session::setProjectLanguage($language);
}
elseif ( $modelid != 0 )
{
- $model = new Model( $modelid );
+ $model = new Model( $modelid );
+ $model->load();
Session::setProjectModel($model);
}
elseif ( $objectid != 0 )
{
- $object = new Object( $objectid );
+ $object = new Object( $objectid );
+ $object->objectLoad();
Session::setObject($object);
}
if ( $elementid != 0 )