version 0.4.3

Author: engram-design

changelog.json

@@ -1,4 +1,14 @@
 [
+    {
+        "version": "0.4.3",
+        "downloadUrl": "https://github.com/engram-design/SuperTable/archive/0.4.3.zip",
+        "date": "2016-02-28 18:15:00",
+        "notes": [
+            "[Fixed] Fixed issue with JS not firing correctly in field settings - caused some field types to not allow editing of settings.",
+            "[Fixed] Fixed issue where blocks were being overwritten when entries are saved as drafts.",
+            "[Improved] You now have direct access to fields when using the Static Field option. No more looping or using `superTableField[0].fieldHandle`."
+        ]
+    },
     {
         "version": "0.4.2",
         "downloadUrl": "https://github.com/engram-design/SuperTable/archive/0.4.2.zip",

supertable/SuperTablePlugin.php

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

supertable/fieldtypes/SuperTableFieldType.php

@@ -172,7 +172,30 @@ public function prepValue($value)
             }
         }
 
-        return $criteria;
+        if ($this->settings->staticField) {
+            return $criteria[0];
+        } else {
+            return $criteria;
+        }
+    }
+
+    public function modifyElementsQuery(DbCommand $query, $value)
+    {
+        if ($value == 'not :empty:') {
+            $value = ':notempty:';
+        }
+
+        if ($value == ':notempty:' || $value == ':empty:') {
+            $alias = 'supertableblocks_'.$this->model->handle;
+            $operator = ($value == ':notempty:' ? '!=' : '=');
+
+            $query->andWhere(
+                "(select count({$alias}.id) from {{supertableblocks}} {$alias} where {$alias}.ownerId = elements.id and {$alias}.fieldId = :fieldId) {$operator} 0",
+                array(':fieldId' => $this->model->id)
+            );
+        } else if ($value !== null) {
+            return false;
+        }
     }
 
     public function getInputHtml($name, $value)
@@ -450,6 +473,7 @@ private function _getBlockTypeInfoForInput($name)
 
             if ($this->element) {
                 $block->setOwner($this->element);
+                $block->locale = $this->element->locale;
             }
 
             $fieldLayoutFields = $blockType->getFieldLayout()->getFields();

supertable/resources/js/SuperTableConfigurator.js

@@ -274,12 +274,6 @@ Craft.SuperTableSettingsModal = Garnish.Modal.extend({
 
         this.$fieldSettings = this.$settingsContainer.appendTo($main);
 
-        // Give the modal window some time to get it together
-        setTimeout($.proxy(function() {
-            Craft.initUiElements(this.$fieldSettings);
-            Garnish.$bod.append(this.fieldTypeFootHtml);
-        }, this), 1);
-
         this.addListener(this.$closeBtn, 'activate', 'closeModal');
     },
 
@@ -305,6 +299,14 @@ Craft.SuperTableSettingsModal = Garnish.Modal.extend({
         this.removeListener(this.$saveBtn, 'click');
     },
 
+    onFadeIn: function() {
+        // Give the modal window some time to get it together
+        setTimeout($.proxy(function() {
+            Craft.initUiElements(this.$fieldSettings);
+            Garnish.$bod.append(this.fieldTypeFootHtml);
+        }, this), 1);
+    },
+
     closeModal: function() {
         this.hide();
     },

supertable/resources/js/SuperTableInput.js

@@ -41,6 +41,16 @@ Craft.SuperTableInputTable = Garnish.Base.extend({
 
         for (var i = 0; i < $rows.length; i++) {
             new Craft.EditableTable.Row(this, $rows[i]);
+
+            var $block = $($rows[i]),
+                id = $block.data('id');
+                
+            // Is this a new block?
+            var newMatch = (typeof id == 'string' && id.match(/new(\d+)/));
+
+            if (newMatch && newMatch[1] > this.totalNewBlocks) {
+                this.totalNewBlocks = parseInt(newMatch[1]);
+            }
         }
 
         this.updateAddBlockBtn();
@@ -153,6 +163,16 @@ Craft.SuperTableInputRow = Garnish.Base.extend({
 
         for (var i = 0; i < this.$rows.length; i++) {
             new Craft.SuperTableInputRow.Row(this, this.$rows[i]);
+
+            var $block = $(this.$rows[i]),
+                id = $block.data('id');
+
+            // Is this a new block?
+            var newMatch = (typeof id == 'string' && id.match(/new(\d+)/));
+
+            if (newMatch && newMatch[1] > this.totalNewBlocks) {
+                this.totalNewBlocks = parseInt(newMatch[1]);
+            }
         }
 
         this.$addRowBtn = this.$divInner.next('.add');
@@ -178,7 +198,7 @@ Craft.SuperTableInputRow = Garnish.Base.extend({
 
         var staticFieldStyle = (this.settings.staticField) ? 'style="display: none;"' : '';
 
-        var html = '<div class="superTableRow">' +
+        var html = '<div class="superTableRow" data-id="'+id+'">' +
             '<input type="hidden" name="'+this.inputNamePrefix+'['+id+'][type]" value="'+type+'">' +
             '<table id="'+id+'" class="shadow-box editable superTable">' +
                 '<tbody>' +

supertable/services/SuperTableService.php

@@ -262,6 +262,12 @@ public function deleteBlockType(SuperTable_BlockTypeModel $blockType)
 
             $this->deleteBlockById($blockIds);
 
+            // Set the new contentTable
+            $originalContentTable = craft()->content->contentTable;
+            $superTableField = craft()->fields->getFieldById($blockType->fieldId);
+            $newContentTable = $this->getContentTableName($superTableField);
+            craft()->content->contentTable = $newContentTable;
+
             // Now delete the block type fields
             $originalFieldColumnPrefix = craft()->content->fieldColumnPrefix;
             craft()->content->fieldColumnPrefix = 'field_';
@@ -270,7 +276,9 @@ public function deleteBlockType(SuperTable_BlockTypeModel $blockType)
                 craft()->fields->deleteField($field);
             }
 
+            // Restore the contentTable and the fieldColumnPrefix to original values.
             craft()->content->fieldColumnPrefix = $originalFieldColumnPrefix;
+            craft()->content->contentTable = $newContentTable;
 
             // Delete the field layout
             craft()->fields->deleteLayoutById($blockType->fieldLayoutId);

supertable/templates/rowInput.html

@@ -8,15 +8,19 @@
     <div class="rowLayoutContainer">
         {% set totalNewBlocks = 0 %}
 
+        {% if settings.staticField %}
+            {% set blocks = [blocks] %}
+        {% endif %}
+
         {% for block in blocks %}
-            <div class="superTableRow">
-                {% set blockId = block.id %}
+            {% set blockId = block.id %}
 
-                {% if not blockId %}
-                    {% set totalNewBlocks = totalNewBlocks + 1 %}
-                    {% set blockId = 'new'~totalNewBlocks %}
-                {% endif %}
+            {% if not blockId %}
+                {% set totalNewBlocks = totalNewBlocks + 1 %}
+                {% set blockId = 'new'~totalNewBlocks %}
+            {% endif %}
 
+            <div class="superTableRow" data-id="{{ blockId }}">
                 <input type="hidden" name="{{ name }}[{{ blockId }}][type]" value="{{ block.getType() }}">
 
                 <table class="shadow-box editable superTable">

supertable/templates/tableInput.html

@@ -24,6 +24,10 @@
         </thead>
         <tbody>
             {% set totalNewBlocks = 0 %}
+
+            {% if settings.staticField %}
+                {% set blocks = [blocks] %}
+            {% endif %}
 
             {% for block in blocks %}
                 {% set blockId = block.id %}