stv0g/vzlogger
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

several smaller bugfixes

Browse source
This commit is contained in:
Steffen Vogel 2010-10-10 19:57:24 +02:00
parent b3bda8226b
commit afeb2a978d
5 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
backend/lib/Model/Aggregator.php
View file

@ -55,7 +55,6 @@ class Aggregator extends Entity {
public function __construct($properties = array()) {
parent::__construct($properties);
$this->channels = new ArrayCollection();
$this->children = new ArrayCollection();
}
@ -120,4 +119,4 @@ class Aggregator extends Entity {
}
?>
?>

3
backend/lib/Model/Channel.php
View file

@ -40,9 +40,6 @@ class Channel extends Entity {
*/
protected $data = NULL;
/** @ManyToMany(targetEntity="Aggregator", mappedBy="channels") */
protected $aggregators;
/**
* Constructor
*/

2
backend/lib/Model/Entity.php
View file

@ -109,7 +109,7 @@ abstract class Entity {
}
if (count($invalidProperties) > 0) {
throw new \Exception('Propert' . ((count($invalidProperties) == 1) ? 'y' : 'ies') . ' "' . implode(', ', $unallowedProperties) . '" ' . ((count($unallowedProperties) == 1) ? 'is' : 'are') . ' not allowed for entity "' . $this->getType() . '"');
throw new \Exception('Propert' . ((count($invalidProperties) == 1) ? 'y' : 'ies') . ' "' . implode(', ', $invalidProperties) . '" ' . ((count($invalidProperties) == 1) ? 'is' : 'are') . ' not allowed for entity "' . $this->getType() . '"');
}
}

2
backend/lib/Model/Proxy/VolkszaehlerModelChannelProxy.php
View file

@ -96,6 +96,6 @@ class VolkszaehlerModelChannelProxy extends \Volkszaehler\Model\Channel implemen
public function __sleep()
{
return array('__isInitialized__', 'id', 'uuid', 'type', 'tokens', 'properties', 'parents', 'data', 'aggregators');
return array('__isInitialized__', 'id', 'uuid', 'type', 'tokens', 'properties', 'parents', 'data');
}
}

4
backend/lib/Router.php
View file

@ -144,7 +144,7 @@ class Router {
*/
public function run() {
$pathInfo = substr($this->pathInfo, 1, strrpos($this->pathInfo, '.') -1); // remove leading slash and format
$pathInfo = explode('/', $pathInfo); // split into path segments
$pathInfo = explode('/', $pathInfo); // split into path segments
if (array_key_exists($pathInfo[0], self::$controllerMapping)) {
$class = self::$controllerMapping[$pathInfo[0]];
@ -226,4 +226,4 @@ class Router {
}
}
?>
?>