Improved logic for Tables min/max rows Fixed #2864

craftcms · May 10, 2018 · e28f739 · e28f739
1 parent 95dafc1
commit e28f739
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 37 deletions.
diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
@@ -20,6 +20,7 @@
 - Fixed warnings about missing SVG files that were logged by Control Panel requests.
 - Fixed a bug where the `|date` filter would ignore date formatting characters that don’t have ICU counterparts. ([#2867](https://github.com/craftcms/cms/issues/2867))
 - Fixed a bug where the global `currentUser` Twig variable could be set to `null` and global sets and could be missing some custom field values when a user was logged-in, if a plugin was loading Twig during or immediately after plugin instantiation. ([#2866](https://github.com/craftcms/cms/issues/2866))
+- Fixed a bug where the table field's min rows setting would disable the add row button when it should not have. ([#2864](https://github.com/craftcms/cms/issues/2864))
 
 ## 3.0.6 - 2018-05-08
 

diff --git a/src/web/assets/cp/dist/js/Craft.js b/src/web/assets/cp/dist/js/Craft.js
@@ -1,4 +1,4 @@
-/*!   - 2018-05-05 */
+/*!   - 2018-05-10 */
 (function($){
 
 /** global: Craft */
@@ -12709,7 +12709,7 @@ Craft.EditableTable = Garnish.Base.extend(
             }
 
             if (this.settings.minRows && this.rowCount < this.settings.minRows) {
-                for (var i = 1; i < this.settings.minRows; i++) {
+                for (var i = this.rowCount; i < this.settings.minRows; i++) {
                     this.addRow()
                 }
             }
@@ -12747,10 +12747,7 @@ Craft.EditableTable = Garnish.Base.extend(
             }
         },
         updateAddRowButton: function() {
-            if (
-                (this.settings.maxRows && this.rowCount >= this.settings.maxRows) ||
-                (this.settings.minRows && this.rowCount < this.settings.minRows)
-            ) {
+            if (this.settings.maxRows && this.rowCount >= this.settings.maxRows) {
                 this.$addRowBtn.css('opacity', '0.2');
                 this.$addRowBtn.css('pointer-events', 'none');
             } else {
@@ -12762,31 +12759,29 @@ Craft.EditableTable = Garnish.Base.extend(
             return (this.rowCount > this.settings.minRows);
         },
         deleteRow: function(row) {
-            if (this.settings.maxRows && this.settings.minRows) {
-                if (!this.canDeleteRow()) {
-                    return;
-                }
+            if (!this.canDeleteRow()) {
+                return;
             }
 
             this.sorter.removeItems(row.$tr);
             row.$tr.remove();
 
-            if (this.settings.minRows && this.settings.maxRows) {
-                this.rowCount--;
-            }
+            this.rowCount--;
 
             this.updateAddRowButton();
             // onDeleteRow callback
             this.settings.onDeleteRow(row.$tr);
         },
         canAddRow: function() {
-            return (this.rowCount < this.settings.maxRows);
+            if (this.settings.maxRows) {
+                return (this.rowCount < this.settings.maxRows);
+            }
+
+            return true;
         },
         addRow: function() {
-            if (this.settings.minRows && this.settings.maxRows) {
-                if (!this.canAddRow()) {
-                    return;
-                }
+            if (!this.canAddRow()) {
+                return;
             }
 
             var rowId = this.settings.rowIdPrefix + (this.biggestId + 1),

diff --git a/src/web/assets/cp/dist/js/Craft.min.js b/src/web/assets/cp/dist/js/Craft.min.js
diff --git a/src/web/assets/cp/dist/js/Craft.min.js.map b/src/web/assets/cp/dist/js/Craft.min.js.map
diff --git a/src/web/assets/cp/src/js/EditableTable.js b/src/web/assets/cp/src/js/EditableTable.js
@@ -55,7 +55,7 @@ Craft.EditableTable = Garnish.Base.extend(
             }
 
             if (this.settings.minRows && this.rowCount < this.settings.minRows) {
-                for (var i = 1; i < this.settings.minRows; i++) {
+                for (var i = this.rowCount; i < this.settings.minRows; i++) {
                     this.addRow()
                 }
             }
@@ -93,10 +93,7 @@ Craft.EditableTable = Garnish.Base.extend(
             }
         },
         updateAddRowButton: function() {
-            if (
-                (this.settings.maxRows && this.rowCount >= this.settings.maxRows) ||
-                (this.settings.minRows && this.rowCount < this.settings.minRows)
-            ) {
+            if (this.settings.maxRows && this.rowCount >= this.settings.maxRows) {
                 this.$addRowBtn.css('opacity', '0.2');
                 this.$addRowBtn.css('pointer-events', 'none');
             } else {
@@ -108,31 +105,29 @@ Craft.EditableTable = Garnish.Base.extend(
             return (this.rowCount > this.settings.minRows);
         },
         deleteRow: function(row) {
-            if (this.settings.maxRows && this.settings.minRows) {
-                if (!this.canDeleteRow()) {
-                    return;
-                }
+            if (!this.canDeleteRow()) {
+                return;
             }
 
             this.sorter.removeItems(row.$tr);
             row.$tr.remove();
 
-            if (this.settings.minRows && this.settings.maxRows) {
-                this.rowCount--;
-            }
+            this.rowCount--;
 
             this.updateAddRowButton();
             // onDeleteRow callback
             this.settings.onDeleteRow(row.$tr);
         },
         canAddRow: function() {
-            return (this.rowCount < this.settings.maxRows);
+            if (this.settings.maxRows) {
+                return (this.rowCount < this.settings.maxRows);
+            }
+
+            return true;
         },
         addRow: function() {
-            if (this.settings.minRows && this.settings.maxRows) {
-                if (!this.canAddRow()) {
-                    return;
-                }
+            if (!this.canAddRow()) {
+                return;
             }
 
             var rowId = this.settings.rowIdPrefix + (this.biggestId + 1),