version 0.4.7

Author: engram-design

changelog.json

@@ -1,4 +1,16 @@
 [
+    {
+        "version": "0.4.7",
+        "downloadUrl": "https://github.com/engram-design/SuperTable/archive/0.4.7.zip",
+        "date": "2016-07-10T13:00:00+10:00",
+        "notes": [
+            "[Added] Added support for eager loading.",
+            "[Added] Added `blocks()` template tag for Super Table block elements.",
+            "[Improved] Column layout width now allows either px or % values. Defaults to % if unit-less.",
+            "[Fixed] Fix for certain fields not settings content properly from draft.",
+            "[Fixed] Fixed column layout not applying width correctly."
+        ]
+    },
     {
         "version": "0.4.6",
         "downloadUrl": "https://github.com/engram-design/SuperTable/archive/0.4.6.zip",

supertable/SuperTablePlugin.php

@@ -14,7 +14,7 @@ public function getName()
 
     public function getVersion()
     {
-        return '0.4.6';
+        return '0.4.7';
     }
 
     public function getSchemaVersion()

supertable/elementtypes/SuperTable_BlockElementType.php

@@ -108,4 +108,27 @@ public function populateElementModel($row)
     {
         return SuperTable_BlockModel::populateModel($row);
     }
+
+    public function getEagerLoadingMap($sourceElements, $handle)
+    {
+        $superTableFieldId = $sourceElements[0]->fieldId;
+        $blockTypes = craft()->superTable->getBlockTypesByFieldId($superTableFieldId);
+
+        if (!isset($blockTypes[0])) {
+            return false;
+        }
+
+        $blockType = $blockTypes[0];
+
+        // Set the field context
+        $contentService = craft()->content;
+        $originalFieldContext = $contentService->fieldContext;
+        $contentService->fieldContext = 'superTableBlockType:' . $blockType->id;
+
+        $map = parent::getEagerLoadingMap($sourceElements, $handle);
+
+        $contentService->fieldContext = $originalFieldContext;
+
+        return $map;
+    }
 }

supertable/fieldtypes/SuperTableFieldType.php

@@ -1,7 +1,7 @@
 <?php
 namespace Craft;
 
-class SuperTableFieldType extends BaseFieldType
+class SuperTableFieldType extends BaseFieldType implements IEagerLoadingFieldType
 {
     // Public Methods
     // =========================================================================
@@ -396,6 +396,34 @@ public function onAfterElementSave()
         craft()->superTable->saveField($this);
     }
 
+    public function getEagerLoadingMap($sourceElements)
+    {
+        // Get the source element IDs
+        $sourceElementIds = array();
+
+        foreach ($sourceElements as $sourceElement) {
+            $sourceElementIds[] = $sourceElement->id;
+        }
+
+        // Return any relation data on these elements, defined with this field
+        $map = craft()->db->createCommand()
+            ->select('ownerId as source, id as target')
+            ->from('supertableblocks')
+            ->where(
+                array('and', 'fieldId=:fieldId', array('in', 'ownerId', $sourceElementIds)),
+                array(':fieldId' => $this->model->id)
+            )
+            ->order('sortOrder')
+            ->queryAll();
+
+        return array(
+            'elementType' => 'SuperTable_Block',
+            'map' => $map,
+            'criteria' => array('fieldId' => $this->model->id)
+        );
+    }
+
+
     // Protected Methods
     // =========================================================================
 
@@ -414,6 +442,7 @@ protected function getSettingsModel()
         return $settings;
     }
 
+
     // Private Methods
     // =========================================================================
 

supertable/models/SuperTable_BlockModel.php

@@ -8,6 +8,7 @@ class SuperTable_BlockModel extends BaseElementModel
 
     protected $elementType = 'SuperTable_Block';
     private $_owner;
+    private $_eagerLoadedBlockTypeElements;
 
     // Public Methods
     // =========================================================================
@@ -92,6 +93,40 @@ public function getFieldContext()
         return 'superTableBlockType:'.$this->typeId;
     }
 
+    public function hasEagerLoadedElements($handle)
+    {
+        if (isset($this->_eagerLoadedBlockTypeElements[$handle])) {
+            return true;
+        }
+
+        return parent::hasEagerLoadedElements($handle);
+    }
+
+    public function getEagerLoadedElements($handle)
+    {
+        if (isset($this->_eagerLoadedBlockTypeElements[$handle])) {
+            return $this->_eagerLoadedBlockTypeElements[$handle];
+        }
+
+        return parent::getEagerLoadedElements($handle);
+    }
+
+    public function setEagerLoadedElements($handle, $elements)
+    {
+        $this->_eagerLoadedBlockTypeElements[$handle] = $elements;
+
+        parent::setEagerLoadedElements($handle, $elements);
+    }
+
+    public function getHasFreshContent()
+    {
+        // Defer to the owner element
+        $owner = $this->getOwner();
+
+        return $owner ? $owner->getHasFreshContent() : false;
+    }
+
+
     // Protected Methods
     // =========================================================================
 
@@ -106,6 +141,7 @@ protected function defineAttributes()
         ));
     }
 
+
     // Private Methods
     // =========================================================================
 

supertable/resources/css/SuperTableInput.css

@@ -46,11 +46,11 @@ body.ltr table.editable.superTable tbody tr td:nth-child(2) {
 }
 
 .superTableColumn table.editable.superTable th.col-header {
-    width: 100%;
+    /*width: 100%;*/
 }
 
 .superTableColumn table.editable.superTable th.col-header[colspan="2"] {
-    width: 48px;
+    width: 29px;
 }
 
 .superTableColumn table.editable.superTable tbody tr td.action + td.action {

supertable/templates/fields.html

@@ -1,21 +1,8 @@
 {% if element is not defined %}{% set element = null %}{% endif %}
 {% if namespace is not defined %}{% set namespace = 'fields' %}{% endif %}
 
-{% set columnSettings = [] %}
-{% if settings is defined and settings %}
-    {% for col in settings.columns %}
-        {% set columnSettings = columnSettings | merge([col]) %}
-    {% endfor %}
-{% endif %}
-
 {% namespace namespace %}
     {% for index, field in fields %}
-
-        {# Additional field settings #}
-        {% if columnSettings[index] is defined %}
-            {% set width = columnSettings[index].width %}
-        {% endif %}
-
         {% if settings is defined and settings.fieldLayout == 'row' %}
 
             <tr data-id="">
@@ -40,7 +27,7 @@
             </tr>
 
         {% else %}
-            <td {% if width is defined and width %}style="width: {{ width }}px"{% endif %}>
+            <td>
                 {% include "supertable/field" with {
                     field:    field.getField(),
                     required: field.required,

supertable/templates/tableInput.html

@@ -4,15 +4,33 @@
 
 <input type="hidden" name="{{ name }}" value="">
 
+{% set columnSettings = [] %}
+{% if settings is defined and settings %}
+    {% for col in settings.columns %}
+        {% set columnSettings = columnSettings | merge([col]) %}
+    {% endfor %}
+{% endif %}
+
 <div class="superTableContainer columnLayout">
     <div class="superTableColumn">
         <table id="{{ id }}" class="shadow-box editable superTable">
             <thead>
                 <tr>
                     <th class="hidden"></th>
+
                     {% if table %}
-                        {% for field in table.getFields() %}
-                            <th scope="col" class="col-header">
+                        {% for index, field in table.getFields() %}
+                            {% if columnSettings[index] is defined %}
+                                {% set width = columnSettings[index].width %}
+
+                                {% if width %}
+                                    {% if 'px' not in width and '%' not in width %}
+                                        {% set width = width ~ '%' %}
+                                    {% endif %}
+                                {% endif %}
+                            {% endif %}
+
+                            <th scope="col" class="col-header" {% if width is defined and width %}style="width: {{ width }}"{% endif %}>
                                 <span class="heading-text {% if field.required %}required{% endif %}">{{ field.name }}</span>
                             </th>
                         {% endfor %}

supertable/variables/SuperTableVariable.php

@@ -3,6 +3,11 @@
 
 class SuperTableVariable
 {
+    public function blocks($criteria)
+    {
+        return craft()->elements->getCriteria('SuperTable_Block', $criteria);
+    }
+
     /**
     * Expands the defualt relationship behaviour to include Super Table
     * fields so that the user can filter by those too.