diff --git a/packages/vulcan-core/lib/modules/components/Datatable.jsx b/packages/vulcan-core/lib/modules/components/Datatable.jsx index 27dda7413..9a8d9a57a 100644 --- a/packages/vulcan-core/lib/modules/components/Datatable.jsx +++ b/packages/vulcan-core/lib/modules/components/Datatable.jsx @@ -110,7 +110,7 @@ DatatableHeader Component */ const DatatableHeader = ({ collection, column }, { intl }) => { - const columnName = typeof column === 'string' ? column : column.name; + const columnName = typeof column === 'string' ? column : column.label || column.name; if (collection) { const schema = collection.simpleSchema()._schema; @@ -172,14 +172,14 @@ const DatatableContents = (props) => { {results.map((document, index) => )} -
- {hasMore ? - isLoadingMore ? - - : - : null - } -
+ {hasMore && +
+ {isLoadingMore ? + : + + } +
+ } ) } @@ -223,7 +223,7 @@ DatatableRow.contextTypes = { DatatableEditForm Component */ -const DatatableEditForm = ({ collection, document, closeModal }) => +const DatatableEditForm = ({ collection, document, closeModal , ...properties }) => removeSuccessCallback={document => { closeModal(); }} + {...properties} /> registerComponent('DatatableEditForm', DatatableEditForm); @@ -242,12 +243,13 @@ registerComponent('DatatableEditForm', DatatableEditForm); DatatableNewForm Component */ -const DatatableNewForm = ({ collection, closeModal }) => +const DatatableNewForm = ({ collection, closeModal, ...properties }) => { closeModal(); }} + {...properties} /> registerComponent('DatatableNewForm', DatatableNewForm); diff --git a/packages/vulcan-core/lib/modules/components/EditButton.jsx b/packages/vulcan-core/lib/modules/components/EditButton.jsx index 143a635da..09622b531 100644 --- a/packages/vulcan-core/lib/modules/components/EditButton.jsx +++ b/packages/vulcan-core/lib/modules/components/EditButton.jsx @@ -3,12 +3,12 @@ import React from 'react'; import Button from 'react-bootstrap/lib/Button'; import { FormattedMessage, intlShape } from 'meteor/vulcan:i18n'; -const EditButton = ({ collection, document, bsStyle = 'primary' }, {intl}) => +const EditButton = ({ collection, document, bsStyle = 'primary', ...properties }, {intl}) => } > - + EditButton.contextTypes = { diff --git a/packages/vulcan-core/lib/modules/components/NewButton.jsx b/packages/vulcan-core/lib/modules/components/NewButton.jsx index f171abfae..cefd598a7 100644 --- a/packages/vulcan-core/lib/modules/components/NewButton.jsx +++ b/packages/vulcan-core/lib/modules/components/NewButton.jsx @@ -3,12 +3,12 @@ import React from 'react'; import Button from 'react-bootstrap/lib/Button'; import { FormattedMessage, intlShape } from 'meteor/vulcan:i18n'; -const NewButton = ({ collection, bsStyle = 'primary' }, {intl}) => +const NewButton = ({ collection, bsStyle = 'primary', ...properties }, {intl}) => } > - + NewButton.contextTypes = { diff --git a/packages/vulcan-forms/lib/components/Form.jsx b/packages/vulcan-forms/lib/components/Form.jsx index 7dc6da803..2a78dd94f 100644 --- a/packages/vulcan-forms/lib/components/Form.jsx +++ b/packages/vulcan-forms/lib/components/Form.jsx @@ -196,6 +196,11 @@ class Form extends Component { field.limit = fieldSchema.limit; } + // add description as help prop + if (fieldSchema.description) { + field.help = fieldSchema.description; + } + // add placeholder if (fieldSchema.placeholder) { field.placeholder = fieldSchema.placeholder;