mirror of
https://github.com/openclassify/openclassify.git
synced 2026-02-08 22:36:06 -06:00
#4307 [multiple-field_type] Error when using in the admin panel
This commit is contained in:
parent
7fc64480eb
commit
1373b3f25c
@ -22,7 +22,7 @@ $(document).on('ajaxComplete ready', function () {
|
|||||||
|
|
||||||
$(this).closest('tr').addClass('success').fadeOut();
|
$(this).closest('tr').addClass('success').fadeOut();
|
||||||
|
|
||||||
wrapper.find('.selected').load(REQUEST_ROOT_PATH + '/streams/multiple-field_type/selected/' + $(this).data('key') + '?uploaded=' + selected.join(','), function () {
|
wrapper.find('.selected').load(REQUEST_ROOT_PATH + '/streams/v-multiple-field_type/selected/' + $(this).data('key') + '?uploaded=' + selected.join(','), function () {
|
||||||
wrapper.sort();
|
wrapper.sort();
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -41,7 +41,7 @@ $(document).on('ajaxComplete ready', function () {
|
|||||||
$('[name="' + field + '"]').val(selected.join(','));
|
$('[name="' + field + '"]').val(selected.join(','));
|
||||||
|
|
||||||
wrapper.find('.selected').load(
|
wrapper.find('.selected').load(
|
||||||
REQUEST_ROOT_PATH + '/streams/multiple-field_type/selected/' + $(this).data('key') + '?uploaded=' + selected.join(','),
|
REQUEST_ROOT_PATH + '/streams/v-multiple-field_type/selected/' + $(this).data('key') + '?uploaded=' + selected.join(','),
|
||||||
function() {
|
function() {
|
||||||
wrapper.sort();
|
wrapper.sort();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -38,7 +38,7 @@ class BuildOptions
|
|||||||
}
|
}
|
||||||
|
|
||||||
$model = $this->fieldType->getRelatedModel();
|
$model = $this->fieldType->getRelatedModel();
|
||||||
$handler = $this->fieldType->config('handler', $model->getMultipleFieldTypeOptionsHandler());
|
$handler = $this->fieldType->config('handler', $model->getVMultipleFieldTypeOptionsHandler());
|
||||||
|
|
||||||
if (!class_exists($handler) && !str_contains($handler, '@')) {
|
if (!class_exists($handler) && !str_contains($handler, '@')) {
|
||||||
$handler = array_get($this->fieldType->getHandlers(), $handler);
|
$handler = array_get($this->fieldType->getHandlers(), $handler);
|
||||||
|
|||||||
@ -30,7 +30,7 @@ class LookupController extends AdminController
|
|||||||
if ($table = $config->get('lookup_table')) {
|
if ($table = $config->get('lookup_table')) {
|
||||||
$table = $container->make($table);
|
$table = $container->make($table);
|
||||||
} else {
|
} else {
|
||||||
$table = $related->newMultipleFieldTypeLookupTableBuilder();
|
$table = $related->newVMultipleFieldTypeLookupTableBuilder();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* @var LookupTableBuilder $table */
|
/* @var LookupTableBuilder $table */
|
||||||
@ -90,7 +90,7 @@ class LookupController extends AdminController
|
|||||||
if ($table = $config->get('selected_table')) {
|
if ($table = $config->get('selected_table')) {
|
||||||
$table = $container->make($table);
|
$table = $container->make($table);
|
||||||
} else {
|
} else {
|
||||||
$table = $related->newMultipleFieldTypeSelectedTableBuilder();
|
$table = $related->newVMultipleFieldTypeSelectedTableBuilder();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* @var SelectedTableBuilder $table */
|
/* @var SelectedTableBuilder $table */
|
||||||
|
|||||||
@ -168,7 +168,7 @@ class MultipleFieldType extends FieldType
|
|||||||
if ($table = $this->config('value_table')) {
|
if ($table = $this->config('value_table')) {
|
||||||
$table = $this->container->make($table);
|
$table = $this->container->make($table);
|
||||||
} else {
|
} else {
|
||||||
$table = $related->newMultipleFieldTypeValueTableBuilder();
|
$table = $related->newVMultipleFieldTypeValueTableBuilder();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* @var ValueTableBuilder $table */
|
/* @var ValueTableBuilder $table */
|
||||||
|
|||||||
@ -29,7 +29,7 @@ class MultipleFieldTypeServiceProvider extends AddonServiceProvider
|
|||||||
protected $routes = [
|
protected $routes = [
|
||||||
'streams/multiple-field_type/json/{key}' => 'Visiosoft\MultipleFieldType\Http\Controller\LookupController@json',
|
'streams/multiple-field_type/json/{key}' => 'Visiosoft\MultipleFieldType\Http\Controller\LookupController@json',
|
||||||
'streams/multiple-field_type/index/{key}' => 'Visiosoft\MultipleFieldType\Http\Controller\LookupController@index',
|
'streams/multiple-field_type/index/{key}' => 'Visiosoft\MultipleFieldType\Http\Controller\LookupController@index',
|
||||||
'streams/multiple-field_type/selected/{key}' => 'Visiosoft\MultipleFieldType\Http\Controller\LookupController@selected',
|
'streams/v-multiple-field_type/selected/{key}' => 'Visiosoft\MultipleFieldType\Http\Controller\LookupController@selected',
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -40,7 +40,7 @@ class MultipleFieldTypeServiceProvider extends AddonServiceProvider
|
|||||||
public function register(EntryModel $model)
|
public function register(EntryModel $model)
|
||||||
{
|
{
|
||||||
$model->bind(
|
$model->bind(
|
||||||
'new_multiple_field_type_lookup_table_builder',
|
'new_v_multiple_field_type_lookup_table_builder',
|
||||||
function (Container $container) {
|
function (Container $container) {
|
||||||
|
|
||||||
/* @var EntryInterface $this */
|
/* @var EntryInterface $this */
|
||||||
@ -55,7 +55,7 @@ class MultipleFieldTypeServiceProvider extends AddonServiceProvider
|
|||||||
);
|
);
|
||||||
|
|
||||||
$model->bind(
|
$model->bind(
|
||||||
'new_multiple_field_type_value_table_builder',
|
'new_v_multiple_field_type_value_table_builder',
|
||||||
function (Container $container) {
|
function (Container $container) {
|
||||||
|
|
||||||
/* @var EntryInterface $this */
|
/* @var EntryInterface $this */
|
||||||
@ -70,7 +70,7 @@ class MultipleFieldTypeServiceProvider extends AddonServiceProvider
|
|||||||
);
|
);
|
||||||
|
|
||||||
$model->bind(
|
$model->bind(
|
||||||
'new_multiple_field_type_selected_table_builder',
|
'new_v_multiple_field_type_selected_table_builder',
|
||||||
function (Container $container) {
|
function (Container $container) {
|
||||||
|
|
||||||
/* @var EntryInterface $this */
|
/* @var EntryInterface $this */
|
||||||
@ -85,7 +85,7 @@ class MultipleFieldTypeServiceProvider extends AddonServiceProvider
|
|||||||
);
|
);
|
||||||
|
|
||||||
$model->bind(
|
$model->bind(
|
||||||
'get_multiple_field_type_options_handler',
|
'get_v_multiple_field_type_options_handler',
|
||||||
function () {
|
function () {
|
||||||
|
|
||||||
/* @var EntryInterface $this */
|
/* @var EntryInterface $this */
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user