Merge branch 'policy-fix' into 'master'

Add additional attributes to policy UI beans

See merge request entgra/carbon-device-mgt!832
temp
Dharmakeerthi Lasantha 3 years ago
commit bb40e4e825

@ -32,6 +32,7 @@ public class Column {
private Input input; private Input input;
private Upload upload; private Upload upload;
private Checkbox checkbox; private Checkbox checkbox;
private boolean isRequired;
@XmlAttribute(name = "name", required = true) @XmlAttribute(name = "name", required = true)
public String getName() { return name; } public String getName() { return name; }
@ -96,4 +97,13 @@ public class Column {
public void setCheckbox(Checkbox checkbox) { public void setCheckbox(Checkbox checkbox) {
this.checkbox = checkbox; this.checkbox = checkbox;
} }
@XmlElement(name = "RequiredItem")
public boolean isRequired() {
return isRequired;
}
public void setRequired(boolean required) {
isRequired = required;
}
} }

@ -31,6 +31,7 @@ public class Item {
private String key; private String key;
private String value; private String value;
private boolean isRequired; private boolean isRequired;
private boolean isNoneEmptyTable;
private String subTitle; private String subTitle;
private List<Condition> conditions; private List<Condition> conditions;
private Checkbox checkbox; private Checkbox checkbox;
@ -103,6 +104,15 @@ public class Item {
isRequired = required; isRequired = required;
} }
@XmlElement(name = "NoneEmptyTable")
public boolean isNoneEmptyTable() {
return isNoneEmptyTable;
}
public void setNoneEmptyTable(boolean noneEmptyTable) {
isNoneEmptyTable = noneEmptyTable;
}
@XmlElement(name = "SubTitle") @XmlElement(name = "SubTitle")
public String getSubTitle() { return subTitle; } public String getSubTitle() { return subTitle; }

Loading…
Cancel
Save