micord/ervu-account-applications
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SUPPORT-9276: use blocked instead active

Browse source
This commit is contained in:
gulnaz 2025-07-22 09:55:10 +03:00
parent feeabbc4d5
commit ec2fb87aa3
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
backend/src/main/java/ru/micord/ervu/account_applications/component/model/Account.java
View file

@ -15,7 +15,7 @@ public class Account {
private String id;
private String start;
private String finish;
private boolean active;
private boolean blocked;
private String appointment;
private int sessionsLimit;
private Domain domain;
@ -46,12 +46,12 @@ public class Account {
this.finish = finish;
}
public boolean isActive() {
return active;
public boolean isBlocked() {
return blocked;
}
public void setActive(boolean active) {
this.active = active;
public void setBlocked(boolean blocked) {
this.blocked = blocked;
}
public String getAppointment() {
@ -93,4 +93,4 @@ public class Account {
public void setRoles(List<Role> roles) {
this.roles = roles;
}
}
}

2
backend/src/main/java/ru/micord/ervu/account_applications/component/service/AccountGridLoadService.java
View file

@ -77,7 +77,7 @@ public class AccountGridLoadService extends Behavior implements GridService {
for (Account account : accounts) {
GridRow gridRow = new GridRow();
gridRow.put("row_uid", account.getId() != null ? account.getId() : "");
gridRow.put("enabled", account.isActive());
gridRow.put("enabled", !account.isBlocked());
Person person = account.getPerson();
if (person != null) {
gridRow.put("login", person.getLogin());