Merge branch 'features' into fix_9826_form_submitted

mautic · Mar 29, 2021 · fc81f71 · fc81f71
2 parents 0d4a457 + cf0cd31
commit fc81f71
Show file tree

Hide file tree

Showing 590 changed files with 13,604 additions and 509 deletions.
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -152,6 +152,7 @@ public function registerBundles(): array
             new Mautic\ReportBundle\MauticReportBundle(),
             new Mautic\SmsBundle\MauticSmsBundle(),
             new Mautic\StageBundle\MauticStageBundle(),
+            new Mautic\StatsBundle\MauticStatsBundle(),
             new Mautic\UserBundle\MauticUserBundle(),
             new Mautic\WebhookBundle\MauticWebhookBundle(),
             new Mautic\CacheBundle\MauticCacheBundle(),

diff --git a/app/bundles/ApiBundle/Tests/Helper/BatchIdToEntityHelperTest.php b/app/bundles/ApiBundle/Tests/Helper/BatchIdToEntityHelperTest.php
@@ -13,6 +13,7 @@
 
 use Mautic\ApiBundle\Helper\BatchIdToEntityHelper;
 use Mautic\LeadBundle\Entity\Lead;
+use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
 
 class BatchIdToEntityHelperTest extends TestCase
@@ -202,4 +203,49 @@ public function testOriginalKeyOrderingForAssociativeArray()
         $orderedEntities = $helper->orderByOriginalKey($entities);
         $this->assertEquals([1, 2, 4], array_keys($orderedEntities));
     }
+
+    public function testOriginalKeyOrderingForFullAssociativeArray()
+    {
+        $entityMock1 = $this->createMock(Lead::class);
+        $entityMock1
+            ->method('getId')
+            ->willReturn(1);
+        $entityMock2 = $this->createMock(Lead::class);
+        $entityMock2
+            ->method('getId')
+            ->willReturn(2);
+        $entityMock3 = $this->createMock(Lead::class);
+        $entityMock3
+            ->method('getId')
+            ->willReturn(3);
+        $entityMock4 = $this->createMock(Lead::class);
+        $entityMock4
+            ->method('getId')
+            ->willReturn(4);
+        $entities = [$entityMock4, $entityMock2, $entityMock1, $entityMock3];
+
+        $parameters = [
+            ['id' => 1, 'foo' => 'bar'],
+            ['id' => 2, 'foo' => 'bar'],
+            ['id' => 3, 'foo' => 'bar'],
+            ['id' => 4, 'foo' => 'bar'],
+        ];
+        $helper          = new BatchIdToEntityHelper($parameters);
+        $orderedEntities = $helper->orderByOriginalKey($entities);
+        $this->assertEquals([0, 1, 2, 3], array_keys($orderedEntities));
+        foreach ($parameters as $key => $contact) {
+            var_dump($orderedEntities[$key]->getId());
+            Assert::assertEquals($orderedEntities[$key]->getId(), $entities[$key]->getId());
+        }
+
+        $parameters = [
+            1 => ['id' => 1, 'foo' => 'bar'],
+            2 => ['id' => 2, 'foo' => 'bar'],
+            3 => ['id' => 3, 'foo' => 'bar'],
+            4 => ['id' => 4, 'foo' => 'bar'],
+        ];
+        $helper          = new BatchIdToEntityHelper($parameters);
+        $orderedEntities = $helper->orderByOriginalKey($entities);
+        $this->assertEquals([1, 2, 3, 4], array_keys($orderedEntities));
+    }
 }
diff --git a/app/bundles/CoreBundle/Assets/css/app.css b/app/bundles/CoreBundle/Assets/css/app.css
diff --git a/app/bundles/CoreBundle/Assets/css/app/less/components/editor.less b/app/bundles/CoreBundle/Assets/css/app/less/components/editor.less
@@ -9,4 +9,27 @@
 
 .content-body .cke_bottom, .content-body .cke_top {
 	background: #f8f8f8;
+}
+
+.ck-mentions span.custom-item{
+	color: #000000;
+}
+.ck-mentions span.custom-item.ck-on, .ck-mentions span.custom-item.ck-on span.custom-item-id{
+	color: #ffffff;
+}
+
+.ck-mentions span.custom-item span.custom-item-id{
+	margin-left: 10px;
+	font-size: smaller;
+	color: #cccccc;
+}
+.ck.ck-dropdown__panel {
+	max-height: 180px;
+	overflow-y: auto;
+}
+.ck-editor__editable:not(.ck-editor__nested-editable) {
+	min-height: 200px;
+}
+.ck.ck-balloon-panel.ck-balloon-panel_caret_se.ck-balloon-panel_visible {
+	z-index: 99999 !important;
 }
diff --git a/app/bundles/CoreBundle/Assets/css/app/less/custom.less b/app/bundles/CoreBundle/Assets/css/app/less/custom.less
@@ -301,4 +301,8 @@ ul.media-list.media-list-feed div.media-object
 .ico-sms:before {
   font-family: "FontAwesome";
   content: "\f27b";
+}
+
+#globalSearchDropdown .list-group-item>a{
+  padding-top: 10px;
 }