Skip to content

Commit 0eb00a6

Browse files
car031car031
committed
1223 added label attribute for templates and attribute sets
1 parent a33ed1d commit 0eb00a6

File tree

21 files changed

+84
-24
lines changed

21 files changed

+84
-24
lines changed

‎logicaldoc-core/src/main/java/com/logicaldoc/core/metadata/AbstractAttributeSet.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ public class AbstractAttributeSet extends ExtensibleObject {
1616
public static final int TYPE_DEFAULT = 0;
1717

1818
private String name;
19+
20+
private String label;
1921

2022
private String description;
2123

@@ -54,4 +56,12 @@ public int getType() {
5456
public void setType(int type) {
5557
this.type = type;
5658
}
59+
60+
public String getLabel() {
61+
return label;
62+
}
63+
64+
public void setLabel(String label) {
65+
this.label = label;
66+
}
5767
}

‎logicaldoc-core/src/main/resources/mappings/AttributeSet.hbm.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<property name="deleted" type="int" column="ld_deleted" not-null="true" />
1717
<property name="name" type="string" column="ld_name" length="255" not-null="true" />
1818
<property name="tenantId" type="long" column="ld_tenantid" not-null="true" />
19+
<property name="label" type="string" column="ld_label" length="255" />
1920
<property name="description" type="string" column="ld_description" length="2000" />
2021
<property name="readonly" type="int" column="ld_readonly" not-null="true" />
2122
<property name="type" type="int" column="ld_type" not-null="true" />

‎logicaldoc-core/src/main/resources/mappings/Template.hbm.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<property name="deleted" type="int" column="ld_deleted" not-null="true" />
1616
<property name="name" type="string" column="ld_name" length="255" not-null="true" />
1717
<property name="tenantId" type="long" column="ld_tenantid" not-null="true" />
18+
<property name="label" type="string" column="ld_label" length="255" />
1819
<property name="description" type="string" column="ld_description" length="2000" />
1920
<property name="readonly" type="int" column="ld_readonly" not-null="true" />
2021
<property name="type" type="int" column="ld_type" not-null="true" />

‎logicaldoc-core/src/main/resources/sql/logicaldoc-core.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ create table ld_systemmessage (ld_id bigint not null, ld_lastmodified timestamp
7171
ld_lastnotified timestamp, ld_status int not null, ld_trials int,
7272
ld_type int not null, ld_html int not null, primary key (ld_id));
7373
create table ld_template (ld_id bigint not null, ld_lastmodified timestamp not null, ld_recordversion bigint not null,
74-
ld_deleted int not null, ld_tenantid bigint not null, ld_name varchar(255) not null,
74+
ld_deleted int not null, ld_tenantid bigint not null, ld_name varchar(255) not null, ld_label varchar(255),
7575
ld_description varchar(2000), ld_readonly int not null, ld_type int not null, ld_validation varchar(4000),
7676
primary key (ld_id));
7777
create table ld_template_ext (ld_templateid bigint not null, ld_mandatory int not null, ld_type int not null,
@@ -83,7 +83,7 @@ create table ld_template_ext (ld_templateid bigint not null, ld_mandatory int no
8383
create table ld_templategroup (ld_templateid bigint not null, ld_groupid bigint not null, ld_write int not null,
8484
primary key (ld_templateid, ld_groupid));
8585
create table ld_attributeset (ld_id bigint not null, ld_lastmodified timestamp not null, ld_recordversion bigint not null,
86-
ld_deleted int not null, ld_tenantid bigint not null, ld_name varchar(255) not null,
86+
ld_deleted int not null, ld_tenantid bigint not null, ld_name varchar(255) not null, ld_label varchar(255),
8787
ld_description varchar(2000), ld_readonly int not null, ld_type int not null,
8888
primary key (ld_id));
8989
create table ld_attributeset_ext (ld_attsetid bigint not null, ld_mandatory int not null, ld_type int not null,

‎logicaldoc-core/src/main/resources/sql/logicaldoc-core.sql.mariadb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ create table ld_systemmessage (ld_id bigint not null, ld_lastmodified datetime n
6969
ld_lastnotified datetime, ld_status int not null, ld_trials int,
7070
ld_type int not null, ld_html int not null, primary key (ld_id)) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
7171
create table ld_template (ld_id bigint not null, ld_lastmodified datetime not null, ld_recordversion bigint not null,
72-
ld_deleted int not null, ld_tenantid bigint not null, ld_name varchar(255) not null,
72+
ld_deleted int not null, ld_tenantid bigint not null, ld_name varchar(255) not null, ld_label varchar(255),
7373
ld_description varchar(2000), ld_readonly int not null, ld_type int not null, ld_validation varchar(4000),
7474
primary key (ld_id)) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
7575
create table ld_template_ext (ld_templateid bigint not null, ld_mandatory int not null, ld_type int not null,

‎logicaldoc-core/src/main/resources/sql/logicaldoc-core.sql.mssql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ create table ld_systemmessage (ld_id bigint not null, ld_lastmodified datetime n
7373
ld_lastnotified datetime, ld_status int not null, ld_trials int,
7474
ld_type int not null, ld_html int not null, primary key (ld_id));
7575
create table ld_template (ld_id bigint not null, ld_lastmodified datetime not null, ld_recordversion bigint not null,
76-
ld_deleted int not null, ld_tenantid bigint not null, ld_name nvarchar(255) not null,
77-
ld_description nvarchar(2000), ld_readonly int not null, ld_type int not null, ld_validation varchar(4000),
76+
ld_deleted int not null, ld_tenantid bigint not null, ld_name nvarchar(255) not null, ld_label nvarchar(255),
77+
ld_description nvarchar(2000), ld_readonly int not null, ld_type int not null, ld_validation nvarchar(4000),
7878
primary key (ld_id));
7979
create table ld_template_ext (ld_templateid bigint not null, ld_mandatory int not null, ld_type int not null,
8080
ld_editor int not null, ld_position int not null, ld_stringvalue nvarchar(4000), ld_stringvalues nvarchar(4000),

‎logicaldoc-core/src/main/resources/sql/logicaldoc-core.sql.mysql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ create table ld_systemmessage (ld_id bigint not null, ld_lastmodified datetime n
6969
ld_lastnotified datetime, ld_status int not null, ld_trials int,
7070
ld_type int not null, ld_html int not null, primary key (ld_id)) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
7171
create table ld_template (ld_id bigint not null, ld_lastmodified datetime not null, ld_recordversion bigint not null,
72-
ld_deleted int not null, ld_tenantid bigint not null, ld_name varchar(255) not null,
72+
ld_deleted int not null, ld_tenantid bigint not null, ld_name varchar(255) not null, ld_label varchar(255),
7373
ld_description varchar(2000), ld_readonly int not null, ld_type int not null, ld_validation varchar(4000),
7474
primary key (ld_id)) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
7575
create table ld_template_ext (ld_templateid bigint not null, ld_mandatory int not null, ld_type int not null,

‎logicaldoc-core/src/main/resources/sql/logicaldoc-core.sql.oracle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ create table ld_systemmessage (ld_id number(19,0) not null, ld_lastmodified time
7373
ld_lastnotified timestamp, ld_status int not null, ld_trials int,
7474
ld_type int not null, ld_html int not null, primary key (ld_id));
7575
create table ld_template (ld_id number(19,0) not null, ld_lastmodified timestamp not null, ld_recordversion number(19,0) not null,
76-
ld_deleted int not null, ld_tenantid number(19,0) not null, ld_name varchar(255) not null,
76+
ld_deleted int not null, ld_tenantid number(19,0) not null, ld_name varchar(255) not null, ld_label varchar(255),
7777
ld_description varchar(2000), ld_readonly int not null, ld_type int not null, ld_validation varchar(4000),
7878
primary key (ld_id));
7979
create table ld_template_ext (ld_templateid number(19,0) not null, ld_mandatory int not null, ld_type int not null,

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/beans/GUIAttributeSet.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ public class GUIAttributeSet implements Serializable {
1414
private long id = 0;
1515

1616
private String name;
17+
18+
private String label;
1719

1820
private String description;
1921

@@ -119,4 +121,12 @@ public int getType() {
119121
public void setType(int type) {
120122
this.type = type;
121123
}
124+
125+
public String getLabel() {
126+
return label;
127+
}
128+
129+
public void setLabel(String label) {
130+
this.label = label;
131+
}
122132
}

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/beans/GUITemplate.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ public class GUITemplate implements Serializable {
2222
private long id = 0;
2323

2424
private String name;
25+
26+
private String label;
2527

2628
private String description;
2729

@@ -170,4 +172,12 @@ public String getValidation() {
170172
public void setValidation(String validation) {
171173
this.validation = validation;
172174
}
175+
176+
public String getLabel() {
177+
return label;
178+
}
179+
180+
public void setLabel(String label) {
181+
this.label = label;
182+
}
173183
}

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/data/AttributeSetsDS.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ public AttributeSetsDS(boolean withEmpty, Integer type) {
1717
DataSourceTextField id = new DataSourceTextField("id");
1818
id.setPrimaryKey(true);
1919
DataSourceTextField name = new DataSourceTextField("name");
20+
DataSourceTextField label = new DataSourceTextField("label");
2021
DataSourceTextField description = new DataSourceTextField("description");
2122
DataSourceTextField readonly = new DataSourceTextField("readonly");
2223
DataSourceIntegerField ttype = new DataSourceIntegerField("type");
23-
setFields(id, name, description, readonly, ttype);
24+
setFields(id, name, label, description, readonly, ttype);
2425
setDataURL("data/attributesets.xml?withempty=" + withEmpty + (type != null ? "&type=" + type : ""));
2526
setClientOnly(true);
2627
}

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/data/TemplatesDS.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ public TemplatesDS(boolean withEmpty, Long templateId, Integer type) {
1717
DataSourceTextField id = new DataSourceTextField("id");
1818
id.setPrimaryKey(true);
1919
DataSourceTextField name = new DataSourceTextField("name");
20+
DataSourceTextField label = new DataSourceTextField("label");
2021
DataSourceTextField description = new DataSourceTextField("description");
2122
DataSourceTextField readonly = new DataSourceTextField("readonly");
2223
DataSourceIntegerField documents = new DataSourceIntegerField("documents");
2324
DataSourceIntegerField ttype = new DataSourceIntegerField("type");
24-
setFields(id, name, description, documents, readonly, ttype);
25+
setFields(id, name, label, description, documents, readonly, ttype);
2526
setDataURL("data/templates.xml?withempty=" + withEmpty + (templateId != null ? "&templateId=" + templateId : "")
2627
+ (type != null ? "&type=" + type : ""));
2728
setClientOnly(true);

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/util/ItemFactory.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,7 @@ public static SelectItem newUserSelector(String name, String title, String group
866866
public static SelectItem newTenantSelector() {
867867
return newTenantSelector(false);
868868
}
869-
869+
870870
public static SelectItem newTenantSelector(boolean appendSystemTenant) {
871871
SelectItem tenant = new SelectItem("tenant");
872872
tenant.setTitle(I18N.message("tenant"));
@@ -944,7 +944,7 @@ public static CheckboxItem newCheckbox(String name, String title) {
944944
item.setTitle(I18N.message(title));
945945
return item;
946946
}
947-
947+
948948
public static CheckboxItem newCheckbox(String name) {
949949
return newCheckbox(name, name);
950950
}
@@ -1968,7 +1968,7 @@ public static TimeItem newTimeItemPicklist(String name, String title) {
19681968

19691969
public static SelectItem newTemplateSelector(boolean withEmpty, Long selectedTemplateId) {
19701970
SelectItem templateItem = new SelectItem("template", I18N.message("template"));
1971-
templateItem.setDisplayField("name");
1971+
templateItem.setDisplayField("label");
19721972
templateItem.setValueField("id");
19731973
templateItem.setWidth(150);
19741974
templateItem.setMultiple(false);
@@ -2040,7 +2040,7 @@ public static SelectItem newAttributeSetSelector() {
20402040
final SelectItem selectItem = new SelectItem("attributeset", I18N.message("attributeset"));
20412041
selectItem.setMultiple(false);
20422042
selectItem.setMultipleAppearance(MultipleAppearance.PICKLIST);
2043-
selectItem.setDisplayField("name");
2043+
selectItem.setDisplayField("label");
20442044
selectItem.setValueField("id");
20452045
selectItem.setWidth(120);
20462046
selectItem.setOptionDataSource(new AttributeSetsDS(false, GUIAttributeSet.TYPE_DEFAULT));
@@ -2194,7 +2194,7 @@ public static SelectItem newWorkflowSelector(Long userId, boolean deployedOnly)
21942194
item.setShowHintInField(true);
21952195
item.setHint(I18N.message(WORKFLOWSELECT) + "...");
21962196
item.setRequiredMessage(I18N.message(FIELDREQUIRED));
2197-
2197+
21982198
ListGridField label = new ColoredListGridField(LABEL, I18N.message(WORKFLOW));
21992199
label.setWidth(150);
22002200

@@ -2223,7 +2223,7 @@ public static SelectItem newWorkflowSelectorForAdministration(Long userId) {
22232223
item.setShowHintInField(true);
22242224
item.setHint(I18N.message(WORKFLOWSELECT) + "...");
22252225
item.setRequiredMessage(I18N.message(FIELDREQUIRED));
2226-
2226+
22272227
ListGridField label = new ColoredListGridField(LABEL, I18N.message(WORKFLOW));
22282228
label.setWidth(150);
22292229

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/metadata/template/AttributeSetPropertiesPanel.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,13 +553,18 @@ protected void addMetadata() {
553553
if (!attributeSet.isReadonly())
554554
name.addChangedHandler(changedHandler);
555555

556+
TextItem label = ItemFactory.newTextItem("label", attributeSet.getLabel());
557+
label.setDisabled(attributeSet.isReadonly());
558+
if (!attributeSet.isReadonly())
559+
label.addChangedHandler(changedHandler);
560+
556561
TextAreaItem description = ItemFactory.newTextAreaItem("description", attributeSet.getDescription());
557562
description.setDisabled(attributeSet.isReadonly());
558563

559564
if (!attributeSet.isReadonly())
560565
description.addChangedHandler(changedHandler);
561566

562-
setPropertiesForm.setItems(id, name, description);
567+
setPropertiesForm.setItems(id, name, label, description);
563568

564569
setPropertiesForm.setWidth(200);
565570
}
@@ -571,6 +576,7 @@ protected boolean validate() {
571576
if (Boolean.FALSE.equals(vm.hasErrors())) {
572577
attributeSet.setName((String) values.get("name"));
573578
attributeSet.setDescription((String) values.get("description"));
579+
attributeSet.setLabel((String) values.get("label"));
574580
}
575581
return !vm.hasErrors();
576582
}

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/metadata/template/AttributeSetsPanel.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,14 @@ public void onDraw() {
6969
name.setCanFilter(true);
7070
name.setCanSort(true);
7171

72+
ListGridField label = new ListGridField("label", I18N.message("label"), 200);
73+
label.setCanFilter(true);
74+
label.setCanSort(true);
75+
7276
ListGridField description = new ListGridField(DESCRIPTION, I18N.message(DESCRIPTION), 300);
7377
description.setCanFilter(true);
7478
description.setCanSort(false);
7579

76-
ListGridField documents = new ListGridField("documents", I18N.message("documents"), 100);
77-
documents.setCanSort(false);
78-
documents.setCanFilter(false);
79-
8080
ListGridField typeSet = new ListGridField("type", I18N.message("type"), 100);
8181
typeSet.setHidden(true);
8282

@@ -89,7 +89,7 @@ public void onDraw() {
8989
list.setAutoFetchData(true);
9090
list.setWidth100();
9191
list.setHeight100();
92-
list.setFields(name, description, documents);
92+
list.setFields(name, label, description);
9393
list.setSelectionType(SelectionStyle.SINGLE);
9494
list.setShowRecordComponents(true);
9595
list.setShowRecordComponentsByCell(true);
@@ -218,6 +218,7 @@ public void updateRecord(GUIAttributeSet set) {
218218

219219
rec.setAttribute("readonly", "" + set.isReadonly());
220220
rec.setAttribute("name", set.getName());
221+
rec.setAttribute("label", set.getLabel() != null ? set.getLabel() : set.getName());
221222
rec.setAttribute(DESCRIPTION, set.getDescription());
222223
list.refreshRow(list.getRecordIndex(rec));
223224

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/metadata/template/TemplatePropertiesPanel.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,9 @@ private void prepareTemplateForm() {
706706
TextAreaItem description = ItemFactory.newTextAreaItem("description", template.getDescription());
707707
description.setDisabled(template.isReadonly() || !template.isWrite());
708708

709+
TextItem label = ItemFactory.newTextItem("label", template.getLabel());
710+
label.setDisabled(template.isReadonly() || !template.isWrite());
711+
709712
PickerIcon computeStat = new PickerIcon(PickerIconName.REFRESH, event -> {
710713
event.getItem().setValue(I18N.message("computing") + "...");
711714
TemplateService.Instance.get().countDocuments(template.getId(), new AsyncCallback<Long>() {
@@ -730,10 +733,12 @@ public void onSuccess(Long count) {
730733
docs.setIcons(computeStat);
731734
docs.setWidth("1%");
732735

733-
if (!template.isReadonly() && template.isWrite())
736+
if (!template.isReadonly() && template.isWrite()) {
734737
description.addChangedHandler(changedHandler);
738+
label.addChangedHandler(changedHandler);
739+
}
735740

736-
templateForm.setItems(id, name, description, docs);
741+
templateForm.setItems(id, name, label, description, docs);
737742

738743
container.addMember(templateForm);
739744
}
@@ -746,6 +751,7 @@ protected boolean validate() {
746751
if (Boolean.FALSE.equals(vm.hasErrors())) {
747752
template.setName((String) values.get("name"));
748753
template.setDescription((String) values.get("description"));
754+
template.setLabel((String) values.get("label"));
749755
}
750756

751757
if (template.getId() != 0L) {

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/metadata/template/TemplatesPanel.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ public void onDraw() {
7373
name.setCanFilter(true);
7474
name.setCanSort(true);
7575

76+
ListGridField label = new ListGridField("label", I18N.message("label"), 200);
77+
label.setCanFilter(true);
78+
label.setCanSort(true);
79+
7680
ListGridField description = new ListGridField(DESCRIPTION, I18N.message(DESCRIPTION), 300);
7781
description.setCanFilter(true);
7882
description.setCanSort(false);
@@ -86,7 +90,7 @@ public void onDraw() {
8690
list.setAutoFetchData(true);
8791
list.setWidth100();
8892
list.setHeight100();
89-
list.setFields(name, description);
93+
list.setFields(name, label, description);
9094
list.setSelectionType(SelectionStyle.SINGLE);
9195
list.setShowRecordComponents(true);
9296
list.setShowRecordComponentsByCell(true);
@@ -215,6 +219,7 @@ public void updateRecord(GUITemplate template) {
215219

216220
rec.setAttribute("readonly", "" + template.isReadonly());
217221
rec.setAttribute("name", template.getName());
222+
rec.setAttribute("label", template.getLabel()!=null ? template.getLabel(): template.getName());
218223
rec.setAttribute(DESCRIPTION, template.getDescription());
219224
list.refreshRow(list.getRecordIndex(rec));
220225
}

‎logicaldoc-webapp/src/main/java/com/logicaldoc/web/data/AttributeSetsDataServlet.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
import javax.servlet.http.HttpServletRequest;
99
import javax.servlet.http.HttpServletResponse;
1010

11+
import org.apache.commons.lang.StringUtils;
12+
1113
import com.logicaldoc.core.PersistenceException;
1214
import com.logicaldoc.core.metadata.AttributeSet;
1315
import com.logicaldoc.core.metadata.AttributeSetDAO;
@@ -61,6 +63,7 @@ protected void service(HttpServletRequest request, HttpServletResponse response,
6163
writer.print("<attributeset>");
6264
writer.print("<id>" + set.getId() + "</id>");
6365
writer.print("<name><![CDATA[" + set.getName() + "]]></name>");
66+
writer.print("<label><![CDATA[" + StringUtils.defaultIfEmpty(set.getLabel(), set.getName()) + "]]></label>");
6467
writer.print("<description><![CDATA[" + set.getDescription() + "]]></description>");
6568
writer.print("<readonly>" + Boolean.toString(set.getReadonly() == 1) + "</readonly>");
6669
writer.print("<type>" + set.getType() + "</type>");

‎logicaldoc-webapp/src/main/java/com/logicaldoc/web/data/TemplatesDataServlet.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ protected void service(HttpServletRequest request, HttpServletResponse response,
6666
writer.print("<template>");
6767
writer.print("<id>" + templ.getId() + "</id>");
6868
writer.print("<name><![CDATA[" + templ.getName() + "]]></name>");
69+
writer.print("<label><![CDATA[" + StringUtils.defaultIfEmpty(templ.getLabel(), templ.getName())+ "]]></label>");
6970
writer.print("<description><![CDATA[" + templ.getDescription() + "]]></description>");
7071
writer.print("<readonly>" + Boolean.toString(templ.getReadonly() == 1) + "</readonly>");
7172
writer.print("<type>" + templ.getType() + "</type>");

‎logicaldoc-webapp/src/main/java/com/logicaldoc/web/service/AttributeSetServiceImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ public GUIAttributeSet save(GUIAttributeSet guiAttributeSet) throws ServerExcept
124124

125125
attributeSet.setTenantId(session.getTenantId());
126126
attributeSet.setName(guiAttributeSet.getName());
127+
attributeSet.setLabel(guiAttributeSet.getLabel());
127128
attributeSet.setDescription(guiAttributeSet.getDescription());
128129
attributeSet.setReadonly(guiAttributeSet.isReadonly() ? 1 : 0);
129130
attributeSet.setType(guiAttributeSet.getType());
@@ -220,6 +221,7 @@ public GUIAttributeSet getAttributeSet(long setId) throws ServerException {
220221
GUIAttributeSet attSet = new GUIAttributeSet();
221222
attSet.setId(setId);
222223
attSet.setName(attributeSet.getName());
224+
attSet.setLabel(attributeSet.getLabel());
223225
attSet.setDescription(attributeSet.getDescription());
224226
attSet.setReadonly(attributeSet.getReadonly() == 1);
225227
attSet.setType(attributeSet.getType());

0 commit comments

Comments
 (0)