Merge branch 'fixes'

Author: patrickbeiersdoerfer

dist/formio.contrib.js

@@ -173,7 +173,7 @@ function (_NestedComponent) {
     value: function hasAddButton() {
       var maxLength = _lodash.default.get(this.component, 'validate.maxLength');
 
-      return !this.component.disableAddingRemovingRows && !this.shouldDisable && !this.options.builder && !this.options.preview && (!maxLength || this.dataValue.length < maxLength);
+      return !this.component.disableAddingRemovingRows && !this.component.disableAddingRows && !this.shouldDisable && !this.options.builder && !this.options.preview && (!maxLength || this.dataValue.length < maxLength);
     }
   }, {
     key: "hasExtraColumn",
@@ -340,6 +340,13 @@ function (_NestedComponent) {
       }, hasTopButton ? this.addButton(true) : null) : null]));
       return needsHeader ? thead : null;
     }
+  }, {
+    key: "restoreValue",
+    value: function restoreValue() {
+      if (this.hasAddButton()) {
+        _get(_getPrototypeOf(DataGridComponent.prototype), "restoreValue", this).call(this);
+      }
+    }
   }, {
     key: "buildRow",
     value: function buildRow(rowData, index, state) {
@@ -799,7 +806,7 @@ function (_NestedComponent) {
   }, {
     key: "emptyValue",
     get: function get() {
-      return [{}];
+      return this.hasAddButton() ? [{}] : [];
     }
   }, {
     key: "addAnotherPosition",

dist/formio.contrib.min.js

@@ -14,6 +14,15 @@ var _default = [{
   clearOnHide: false,
   customConditional: 'show = !data.enableRowGroups',
   calculateValue: 'value = data.enableRowGroups ? true : data.disableAddingRemovingRows;'
+}, {
+  type: 'checkbox',
+  label: 'Disable Adding Rows',
+  key: 'disableAddingRows',
+  tooltip: 'Check if you want to hide Add Another button',
+  weight: 406,
+  input: true,
+  clearOnHide: false,
+  customConditional: 'show = !data.disableAddingRemovingRows'
 }, {
   type: 'textfield',
   label: 'Add Another Text',

dist/formio.embed.js

@@ -48,7 +48,7 @@ export default class DataGridComponent extends NestedComponent {
   }
 
   get emptyValue() {
-    return [{}];
+    return (this.hasAddButton()) ? [{}] : [];
   }
 
   get addAnotherPosition() {
@@ -62,6 +62,7 @@ export default class DataGridComponent extends NestedComponent {
   hasAddButton() {
     const maxLength = _.get(this.component, 'validate.maxLength');
     return !this.component.disableAddingRemovingRows &&
+    !this.component.disableAddingRows  &&
     !this.shouldDisable &&
       !this.options.builder &&
       !this.options.preview &&
@@ -240,6 +241,12 @@ export default class DataGridComponent extends NestedComponent {
     return this.emptyValue;
   }
 
+  restoreValue() {
+    if (this.hasAddButton()) {
+      super.restoreValue();
+    }
+  }
+
   buildRow(rowData, index, state) {
     state = state || {};
     const components = _.get(this, 'component.components', []);

dist/formio.embed.min.js

@@ -10,6 +10,16 @@ export default [
     customConditional: 'show = !data.enableRowGroups',
     calculateValue: 'value = data.enableRowGroups ? true : data.disableAddingRemovingRows;',
   },
+  {
+    type: 'checkbox',
+    label: 'Disable Adding Rows',
+    key: 'disableAddingRows',
+    tooltip: 'Check if you want to hide Add Another button',
+    weight: 406,
+    input: true,
+    clearOnHide: false,
+    customConditional: 'show = !data.disableAddingRemovingRows'
+  },
   {
     type: 'textfield',
     label: 'Add Another Text',