Merge pull request #713 from dasgarner/release21

Release 2.1.2
xibosignage · Oct 28, 2019 · 8f6ac77 · 8f6ac77
2 parents 9d7756d + 64ad153
commit 8f6ac77
Show file tree

Hide file tree

Showing 46 changed files with 107 additions and 72 deletions.
diff --git a/lib/Entity/Layout.php b/lib/Entity/Layout.php
@@ -968,7 +968,7 @@ public function toXlf()
 
         // Keep track of whether this layout has an empty region
         $layoutHasEmptyRegion = false;
-        $layoutCountRegionsWithMinDuration = 0;
+        $layoutCountRegionsWithDuration = 0;
 
         $document = new \DOMDocument();
         $layoutNode = $document->createElement('layout');
@@ -1043,6 +1043,13 @@ public function toXlf()
                 $layoutHasEmptyRegion = true;
             }
 
+            // Work out if we have any "lead regions", those are Widgets with a duration
+            foreach ($widgets as $widget) {
+                if ($widget->useDuration == 1 || $countWidgets > 1 || $regionLoop == 1 || $widget->type == 'video') {
+                    $layoutCountRegionsWithDuration++;
+                }
+            }
+
             foreach ($widgets as $widget) {
                 /* @var Widget $widget */
                 $module = $this->moduleFactory->createWithWidget($widget, $region);
@@ -1064,12 +1071,15 @@ public function toXlf()
                 // the only time we want to override this, is if we want it set to the Minimum Duration for the XLF
                 $widgetDuration = $widget->calculatedDuration;
 
-                if ($widget->useDuration == 0 && $countWidgets <= 1 && $regionLoop == 0 && count($this->regions) > $layoutCountRegionsWithMinDuration + 1) {
-                    // We have a widget without a specified duration in a region on its own and the region isn't set to
-                    // loop.
-                    // Reset to the minimum duration
+                // Is this Widget one that does not have a duration of its own?
+                // Assuming we have at least 1 region with a set duration, then we ought to
+                // Reset to the minimum duration
+                if ($widget->useDuration == 0 && $countWidgets <= 1 && $regionLoop == 0 && $widget->type != 'video'
+                    && $layoutCountRegionsWithDuration >= 1
+                ) {
+                    // Make sure this Widget expires immediately so that the other Regions can be the leaders when
+                    // it comes to expiring the Layout
                     $widgetDuration = Widget::$widgetMinDuration;
-                    $layoutCountRegionsWithMinDuration++;
                 }
 
                 // Region duration

diff --git a/lib/Helper/Environment.php b/lib/Helper/Environment.php
@@ -29,7 +29,7 @@
  */
 class Environment
 {
-    public static $WEBSITE_VERSION_NAME = '2.1.1';
+    public static $WEBSITE_VERSION_NAME = '2.1.2';
     public static $XMDS_VERSION = '5';
     public static $XLF_VERSION = '2';
     public static $VERSION_REQUIRED = '5.5';

diff --git a/locale/af.mo b/locale/af.mo
diff --git a/locale/ar.mo b/locale/ar.mo
diff --git a/locale/bg.mo b/locale/bg.mo
diff --git a/locale/ca.mo b/locale/ca.mo
diff --git a/locale/cs.mo b/locale/cs.mo
diff --git a/locale/da.mo b/locale/da.mo
diff --git a/locale/de.mo b/locale/de.mo
diff --git a/locale/default.pot b/locale/default.pot
diff --git a/locale/el.mo b/locale/el.mo
diff --git a/locale/en_GB.mo b/locale/en_GB.mo
diff --git a/locale/es.mo b/locale/es.mo
diff --git a/locale/et.mo b/locale/et.mo
diff --git a/locale/eu.mo b/locale/eu.mo
diff --git a/locale/fa.mo b/locale/fa.mo
diff --git a/locale/fi.mo b/locale/fi.mo
diff --git a/locale/fr.mo b/locale/fr.mo
diff --git a/locale/he.mo b/locale/he.mo
diff --git a/locale/hi.mo b/locale/hi.mo
diff --git a/locale/hr.mo b/locale/hr.mo
diff --git a/locale/hu.mo b/locale/hu.mo
diff --git a/locale/id.mo b/locale/id.mo
diff --git a/locale/it.mo b/locale/it.mo
diff --git a/locale/ja.mo b/locale/ja.mo
diff --git a/locale/ko.mo b/locale/ko.mo
diff --git a/locale/ku.mo b/locale/ku.mo
diff --git a/locale/lb.mo b/locale/lb.mo
diff --git a/locale/lo.mo b/locale/lo.mo
diff --git a/locale/lt.mo b/locale/lt.mo
diff --git a/locale/nb.mo b/locale/nb.mo
diff --git a/locale/nl.mo b/locale/nl.mo
diff --git a/locale/nl_NL.mo b/locale/nl_NL.mo
diff --git a/locale/pl.mo b/locale/pl.mo
diff --git a/locale/pt.mo b/locale/pt.mo
diff --git a/locale/pt_BR.mo b/locale/pt_BR.mo
diff --git a/locale/ro.mo b/locale/ro.mo
diff --git a/locale/ru.mo b/locale/ru.mo
diff --git a/locale/sk.mo b/locale/sk.mo
diff --git a/locale/sl.mo b/locale/sl.mo
diff --git a/locale/sv.mo b/locale/sv.mo
diff --git a/locale/th.mo b/locale/th.mo
diff --git a/locale/tr.mo b/locale/tr.mo
diff --git a/locale/vi.mo b/locale/vi.mo
diff --git a/locale/zh_CN.mo b/locale/zh_CN.mo
diff --git a/locale/zh_TW.mo b/locale/zh_TW.mo