Skip to content
This repository was archived by the owner on Feb 17, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions js/render.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
(function ($, Drupal) {

Drupal.behaviors.fobFieldMore = {
attach: function (context) {
var $button = $('.fob-field-more', context);

$button.each(function () {
var $wrapper = $button.closest('.form-item');
var $table = $wrapper.find('table:last tbody');
$table.find('tr').slice(-2).addClass('fobHelper').css('display', 'none');

// trigger to "add more" button, clone last element, append to the table
$button.click(function () {
var delta = $table.find('tr').length - 2;
var $row = $table.find('tr:nth-last-child(2)').removeClass('fobHelper');

// Fix delta, path, items, …
$row.find('input, textarea, select').each(function () {
var name = $(this).attr('name').replace(/^(.+)\[\d+\](.+)$/, '$1[' + delta + ']$2');
$(this).attr('name', name);
});

// create last row for table
$row.clone().addClass('fobHelper').appendTo($table);
$row.css('display', 'table-row');

// do not submit form
return false;
});
});

// on form delete, remove fake items
$button.first().closest('form').bind('submit', function () {
$button.each(function () {
$('.fobHelper').remove();
});
});
}
};

})(jQuery, Drupal);
10 changes: 0 additions & 10 deletions src/Controller/EntityEditController.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,6 @@
use Drupal\form_builder\Controller\EntityEditController\SubmitHandler;
use Drupal\form_builder\FormEntity;

/**
* TODO:
*
* 1. User add/remove entity type => update fields.
* 2. Available fields list
* 3. Added fields list
* 4. …
* n. Submit handler
*
*/
class EntityEditController
{

Expand Down
4 changes: 4 additions & 0 deletions src/Controller/EntityViewController.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ public static function pageCallback(FormEntity $form, $slug = '', $pageNumber =
if ($slug !== $form->getSlug()) {
drupal_goto($form->getPath($pageNumber));
}

// include client script
drupal_add_js(drupal_get_path('module', 'form_builder') . '/js/render.js');

return $form->render($pageNumber, self::createFormSubmissionFromCache($form, $pageNumber));
}

Expand Down
13 changes: 11 additions & 2 deletions src/FormCenter/DrupalFieldWidget.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ protected function renderFieldTypes(FieldInterface $field, FieldOptions $fieldOp
* @param FieldInterface $field
* @param FieldOptions $fieldOptions
* @param FieldValueItemInterface[] $fieldValueItems
* @return type
* @return string
*/
protected function renderDrupalField(FieldInterface $field, FieldOptions $fieldOptions, array $fieldValueItems = [])
public function renderDrupalField(FieldInterface $field, FieldOptions $fieldOptions, array $fieldValueItems = [])
{
$eTName = $field->getEntityType()->getName();
$dETName = $field->getEntityType()->getDrupalEntityTypeName();
Expand Down Expand Up @@ -71,10 +71,19 @@ protected function renderDrupalField(FieldInterface $field, FieldOptions $fieldO
];

$e = &$form[$dFName][$dLang];
if ($dField['cardinality'] == -1) {
$dFormState['field']['#parents'][$dFName]['und']['#fields'][$dFName]['und'] = ['items_count' => 2];
}
$e = field_multiple_value_form($dField, $dFieldInstance, $dLang, $dItems, $dForm, $dFormState);

$form['#parents'] = [];
$form_state = ['values' => [], 'complete form' => $form];

if (!empty($e['add_more']['#ajax'])) {
unset($e['add_more']['#ajax'], $e['add_more']['#submit']);
$e['add_more']['#attributes']['class'][] = 'fob-field-more';
}

form_builder('form_builder_element', $form, $form_state);

foreach (element_children($form[$dFName][$dLang]) as $delta) {
Expand Down