v2.0.0-beta.8

Author: kjmartens

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Solspace Freeform Changelog
 
+## 2.0.0-beta.8 - 2018-02-14
+### Fixed
+- Fixed a bug where the CP Submissions list page broke after Craft 3 RC 10 update.
+
 ## 2.0.0-beta.7 - 2018-02-13
 ### Added
 - Added Dutch translations.

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "solspace/craft3-freeform",
   "description": "The most intuitive and powerful form builder for Craft.",
-  "version": "2.0.0-beta.7",
+  "version": "2.0.0-beta.8",
   "type": "craft-plugin",
   "minimum-stability": "dev",
   "authors": [

src/Elements/Db/SubmissionQuery.php

@@ -123,11 +123,8 @@ protected function beforePrepare(): bool
             $this->subQuery->andWhere(Db::parseParam($table . '.incrementalId', $this->incrementalId));
         }
 
-        if ($this->status && \is_string($this->status) && preg_match('/ /', $this->status)) {
-            $status = explode(' ', $this->status);
-            $status = reset($status);
-
-            $this->subQuery->andWhere(Db::parseParam($statusTable . '.handle', $status));
+        if ($this->status && \is_string($this->status)) {
+            $this->subQuery->andWhere(Db::parseParam($statusTable . '.handle', $this->status));
             $this->status = '';
         }
 

src/Elements/Submission.php

@@ -106,7 +106,7 @@ public static function statuses(): array
 
         $list = [];
         foreach ($statuses as $status) {
-            $list[$status->handle . ' ' . $status->color] = $status->name;
+            $list[$status->handle] = ['label' => $status->name, 'color' => $status->color];
         }
 
         return $list;
@@ -245,6 +245,10 @@ protected static function defineActions(string $source = null): array
      */
     protected function tableAttributeHtml(string $attribute): string
     {
+        if ($attribute === 'status') {
+            return $this->getStatusModel()->name;
+        }
+
         $value = $this->$attribute;
 
         if (\is_array($value)) {
@@ -284,10 +288,18 @@ protected function tableAttributeHtml(string $attribute): string
         return parent::tableAttributeHtml($attribute);
     }
 
+    /**
+     * @return string
+     */
+    public function getStatus(): string
+    {
+        return $this->getStatusModel()->handle;
+    }
+
     /**
      * @return StatusModel
      */
-    public function getStatus(): StatusModel
+    public function getStatusModel(): StatusModel
     {
         return Freeform::getInstance()->statuses->getStatusById($this->statusId);
     }