Merge pr #1281 from @dmolineus

discordier · discordier · commit 0db065ca409b · 2019-03-08T21:51:36.000+01:00
This fixes a bug in legend handling when legends are
extended.
diff --git a/src/CoreBundle/EventListener/DcGeneral/Table/AbstractPaletteRestrictionListener.php b/src/CoreBundle/EventListener/DcGeneral/Table/AbstractPaletteRestrictionListener.php
@@ -12,6 +12,7 @@
  *
  * @package    MetaModels/core
  * @author     Christian Schiffler <c.schiffler@cyberspectrum.de>
+ * @author     David Molineus <david.molineus@netzmacht.de>
  * @copyright  2012-2019 The MetaModels team.
  * @license    https://github.com/MetaModels/core/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
@@ -47,6 +48,10 @@ class AbstractPaletteRestrictionListener
      */
     protected function getLegend($name, $palette, $prevLegend = null)
     {
+        if (strpos($name, '+') === 0) {
+            $name = substr($name, 1);
+        }
+
         if (!$palette->hasLegend($name)) {
             $palette->addLegend(new Legend($name), $prevLegend);
         }

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`*`
`13`	`13`	`* @package MetaModels/core`
`14`	`14`	`* @author Christian Schiffler <c.schiffler@cyberspectrum.de>`
	`15`	`+ * @author David Molineus <david.molineus@netzmacht.de>`
`15`	`16`	`* @copyright 2012-2019 The MetaModels team.`
`16`	`17`	`* @license https://github.com/MetaModels/core/blob/master/LICENSE LGPL-3.0-or-later`
`17`	`18`	`* @filesource`
`@@ -47,6 +48,10 @@ class AbstractPaletteRestrictionListener`
`47`	`48`	`*/`
`48`	`49`	`protected function getLegend($name, $palette, $prevLegend = null)`
`49`	`50`	`{`
	`51`	`+ if (strpos($name, '+') === 0) {`
	`52`	`+ $name = substr($name, 1);`
	`53`	`+ }`
	`54`	`+`
`50`	`55`	`if (!$palette->hasLegend($name)) {`
`51`	`56`	`$palette->addLegend(new Legend($name), $prevLegend);`
`52`	`57`	`}`