Hide properties irrelevant for groups (#726)

volkszaehler · Mar 6, 2019 · 4a0bbed · 4a0bbed
1 parent 2f75297
commit 4a0bbed
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/lib/Definition/EntityDefinition.php b/lib/Definition/EntityDefinition.php
@@ -23,9 +23,12 @@
 namespace Volkszaehler\Definition;
 
 use Volkszaehler\Util;
+use Volkszaehler\Model\Aggregator;
 
 /**
  * @author Steffen Vogel <info@steffenvogel.de>
+ * @author Andreas Goetz <cpuidle@gmx.de>
+ * @package default
  */
 class EntityDefinition extends Definition {
 	/**
@@ -107,6 +110,7 @@ class EntityDefinition extends Definition {
 	 */
 	static protected $defaultRequired = array('title');
 	static protected $defaultOptional = array('public', 'color', 'style', 'fillstyle', 'yaxis', 'active', 'description', 'owner', 'address:', 'link');
+	static protected $groupOptional = array('public', 'color', 'active', 'description', 'owner', 'address:', 'link');
 
 	/**
 	 * Constructor
@@ -117,7 +121,11 @@ protected function __construct($object) {
 	 	parent::__construct($object);
 
 	 	$this->required = array_merge(self::$defaultRequired, $this->required);
-	 	$this->optional = array_merge(self::$defaultOptional, $this->optional);
+
+	 	$optional = $this->getModel() == Aggregator::class
+	 		? self::$groupOptional
+	 		: self::$defaultOptional;
+		$this->optional = array_merge($optional, $this->optional);
 	 }
 
 	/*