Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[4.1] Allow passing parent form fields along with inline create dialog request #3013

Merged
merged 1 commit into from
Jul 9, 2020
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,19 @@

//route to modal
$field['inline_create']['modal_route'] = route($field['inline_create']['entity']."-inline-create");

//include main form fields in the request when asking for modal data,
//allow the developer to modify the inline create modal
//based on some field on the main form
$field['inline_create']['include_main_form_fields'] = $field['inline_create']['include_main_form_fields'] ?? false;

if($field['inline_create']['include_main_form_fields'] !== false || $field['inline_create']['include_main_form_fields'] !== true) {
if(is_array($field['inline_create']['include_main_form_fields'])) {
$field['inline_create']['include_main_form_fields'] = json_encode($field['inline_create']['include_main_form_fields']);
}else{
$field['inline_create']['include_main_form_fields'] = json_encode([$field['inline_create']['include_main_form_fields']]);
}
}
}
}

Expand Down Expand Up @@ -105,6 +118,7 @@
data-field-ajax="{{var_export($field['ajax'])}}"
data-inline-modal-class="{{ $field['inline_create']['modal_class'] }}"
data-app-current-lang="{{ app()->getLocale() }}"
data-include-main-form-fields="{{$field['inline_create']['include_main_form_fields']}}"

@if($activeInlineCreate)
@include('crud::fields.relationship.field_attributes')
Expand Down Expand Up @@ -236,6 +250,9 @@ function setupInlineCreateButtons(element) {
var $inlineModalRoute = element.attr('data-inline-modal-route');
var $inlineModalClass = element.attr('data-inline-modal-class');
var $parentLoadedFields = element.attr('data-parent-loaded-fields');
var $includeMainFormFields = element.attr('data-include-main-form-fields');
var $form = element.closest('form');

$inlineCreateButtonElement.on('click', function () {

//we change button state so users know something is happening.
Expand All @@ -245,14 +262,44 @@ function setupInlineCreateButtons(element) {
$inlineCreateButtonElement.html(loadingText);


}
//prepare main form fields to be submited in case there are some.
//if result is "1" it means all form fields will be passed, developer passed "true".
if($includeMainFormFields == 1) {
var $toPass = $form.serializeArray();
$includeMainFormFields = true;
}else{
$fields = JSON.parse($includeMainFormFields);
$serializedForm = $form.serializeArray();
var $toPass = [];
$fields.forEach(function(value, index) {
$valueFromForm = $serializedForm.filter(field => field.name === value);
$toPass.push($valueFromForm[0]);

});
//if it's undefined here, developer passed false.
if(typeof $toPass[0] === "undefined") {
$includeMainFormFields = false;
}
}
$.ajax({
url: $inlineModalRoute,
data: {
'entity': $fieldEntity,
'modal_class' : $inlineModalClass,
'parent_loaded_fields' : $parentLoadedFields,
},
data: (function() {
if($includeMainFormFields) {
return {
'entity': $fieldEntity,
'modal_class' : $inlineModalClass,
'parent_loaded_fields' : $parentLoadedFields,
'main_form_fields' : $toPass
};
}else{
return {
'entity': $fieldEntity,
'modal_class' : $inlineModalClass,
'parent_loaded_fields' : $parentLoadedFields
};
}
})(),
type: 'POST',
success: function (result) {
$('body').append(result);
Expand Down