Skip to content

Фикс ошибки чтения роли #571

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
theshadowco merged 1 commit into from
Jan 13, 2026
+32 −1
Merged

Фикс ошибки чтения роли #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/RoleDataConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public class RoleDataConverter implements ReadConverter {

private static final String OBJECT_NODE_NAME = "object";
private static final String RIGHT_NODE_NAME = "right";
private static final String RESTRICTION_TEMPLATE_NODE_NAME = "restrictionTemplate";

@Override
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
Expand All @@ -53,6 +54,10 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
if (OBJECT_NODE_NAME.equals(name)) {
var objectRight = readObjectRight(reader, context);
builder.objectRight(objectRight);
} else if (RESTRICTION_TEMPLATE_NODE_NAME.equals(name)) {
// пропускаем
reader.moveUp();
continue;
} else {
var fieldClass = (Class<?>) TransformationUtils.fieldType(builder, name);
Objects.requireNonNull(fieldClass, "Field type not found for: " + name);
Expand All @@ -76,7 +81,7 @@ private static RoleData.ObjectRight readObjectRight(HierarchicalStreamReader rea
builder.right(right);
} else {
var fieldClass = (Class<?>) TransformationUtils.fieldType(builder, name);
if(fieldClass == null) {
if (fieldClass == null) {
continue;
}
var value = ExtendXStream.readValue(context, fieldClass);
Expand Down
13 changes: 13 additions & 0 deletions src/test/resources/ext/designer/mdclasses/src/cf/Roles/Роль1/Ext/Rights.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,4 +220,17 @@
<value>true</value>
</right>
</object>
<restrictionTemplate>
<name>ДляОбъекта(ПолеОбъекта)</name>
<condition>// ДляОбъекта(ПолеОбъекта = "")
#Если &amp;СпискиСОтключеннымОграничениемЧтения = "Неопределено" #Тогда
// Информационная база заблокирована для обновления.
ГДЕ ЛОЖЬ
#Иначе
ТекущаяТаблица ГДЕ ИСТИНА В
(
ВЫБРАТЬ ПЕРВЫЕ 1 ИСТИНА
)
</condition>
</restrictionTemplate>
</Rights>
13 changes: 13 additions & 0 deletions src/test/resources/ext/edt/mdclasses/configuration/src/Roles/Роль1/Rights.rights
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,4 +220,17 @@
<value>true</value>
</right>
</object>
<restrictionTemplate>
<name>ДляОбъекта(ПолеОбъекта)</name>
<condition>// ДляОбъекта(ПолеОбъекта = "")
#Если &amp;СпискиСОтключеннымОграничениемЧтения = "Неопределено" #Тогда
// Информационная база заблокирована для обновления.
ГДЕ ЛОЖЬ
#Иначе
ТекущаяТаблица ГДЕ ИСТИНА В
(
ВЫБРАТЬ ПЕРВЫЕ 1 ИСТИНА
)
</condition>
</restrictionTemplate>
</Rights>
Loading