upd defult editing field sequences generation when ownership fields defined
This commit is contained in:
@@ -3,8 +3,10 @@ from aiogram.utils.keyboard import InlineKeyboardBuilder
|
||||
|
||||
from ....model.settings import Settings
|
||||
from ....model.descriptors import FieldDescriptor
|
||||
from ....model.user import UserBase
|
||||
from ..context import ContextData, CallbackCommand, CommandContext
|
||||
from ....utils.navigation import get_navigation_context, pop_navigation_context
|
||||
from ....utils.main import build_field_sequence
|
||||
|
||||
|
||||
async def wrap_editor(
|
||||
@@ -12,6 +14,7 @@ async def wrap_editor(
|
||||
field_descriptor: FieldDescriptor,
|
||||
callback_data: ContextData,
|
||||
state_data: dict,
|
||||
user: UserBase,
|
||||
):
|
||||
if callback_data.context in [
|
||||
CommandContext.ENTITY_CREATE,
|
||||
@@ -36,7 +39,14 @@ async def wrap_editor(
|
||||
form = field_descriptor.entity_descriptor.forms.get(
|
||||
form_name, field_descriptor.entity_descriptor.default_form
|
||||
)
|
||||
field_sequence = form.edit_field_sequence
|
||||
if form.edit_field_sequence:
|
||||
field_sequence = form.edit_field_sequence
|
||||
else:
|
||||
field_sequence = build_field_sequence(
|
||||
entity_descriptor=field_descriptor.entity_descriptor,
|
||||
user=user,
|
||||
callback_data=callback_data,
|
||||
)
|
||||
field_index = (
|
||||
field_sequence.index(field_descriptor.name)
|
||||
if callback_data.context
|
||||
|
||||
Reference in New Issue
Block a user