Merge pull request #6270 from graham73may/feature__select-multiple-co…

…ntenttypes Modded core's select field to accommodate for multiple contenttypes.
bolt · Jan 24, 2017 · edca9fd · edca9fd
2 parents 6820427 + 4ab588d
commit edca9fd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/app/view/twig/editcontent/fields/_select.twig b/app/view/twig/editcontent/fields/_select.twig
@@ -21,6 +21,11 @@
         {% set lookupfieldlist = lookupfield|split(',') %}
     {% endif %}
     {% set sortingorder = field.sort|default(lookupfieldlist|default([])|first)|default(lookupfield)|default('id') %}
+
+    {% if sortingorder == 'contenttype' %}
+        {% set sortingorder = field.sort|default(lookupfieldlist[1]|default([]))|default(lookupfield)|default('id') %}
+    {% endif %}
+
     {% set querylimit = field.limit|default(500) %}
     {% set wherefilter = field.filter|default({}) %}
     {% setcontent lookups = lookuptype where wherefilter order sortingorder nohydrate limit querylimit %}

diff --git a/src/Twig/Runtime/RecordRuntime.php b/src/Twig/Runtime/RecordRuntime.php
@@ -275,14 +275,20 @@ public function selectField($content, $fieldName, $startempty = false, $keyName
             if (is_array($fieldName)) {
                 $row = [];
                 foreach ($fieldName as $fn) {
-                    $row[] = isset($c->values[$fn]) ? $c->values[$fn] : null;
+                    if ($fn === 'contenttype') {
+                        $element = $c->contenttype['slug'] . '/' . $element;
+                        $row[]   = $c->contenttype['singular_name'];
+                    } else {
+                        $row[] = isset($c->values[$fn]) ? $c->values[$fn] : null;
+                    }
                 }
                 $retval[$element] = $row;
+            } else if ($fieldName === 'contenttype') {
+                $retval[$element] = $c->contenttype['singular_name'];
             } elseif (isset($c->values[$fieldName])) {
                 $retval[$element] = $c->values[$fieldName];
             }
         }
-
         return $retval;
     }
 }