Pokud zadává požadavek uživatel, který je zároveň první ze schvalujících
(vedoucí komise), požadavek se za tohoto schvalovatele schválí automaticky hned při vytvoření. closes #162
This commit is contained in:
+6
-4
@@ -68,7 +68,11 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
|
|||||||
|
|
||||||
super.add(entity);
|
super.add(entity);
|
||||||
|
|
||||||
this.sendToApprovers(entity);
|
if (canApprove(entity)) {
|
||||||
|
approve(entity);
|
||||||
|
} else {
|
||||||
|
this.sendToApprovers(entity);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void checkEnable() {
|
private void checkEnable() {
|
||||||
@@ -220,12 +224,10 @@ public abstract class RequirementBaseServiceImpl<T extends RequirementBase> exte
|
|||||||
} else {
|
} else {
|
||||||
e.setState(RequirementState.PARTIALLY);
|
e.setState(RequirementState.PARTIALLY);
|
||||||
}
|
}
|
||||||
entity.setState(e.getState());
|
|
||||||
entity.getAuthorization().add(auth);
|
|
||||||
|
|
||||||
super.update(e);
|
super.update(e);
|
||||||
|
|
||||||
if (!autoApprove(entity)) {
|
if (!autoApprove(e)) {
|
||||||
this.sendToApprovers(e);
|
this.sendToApprovers(e);
|
||||||
|
|
||||||
SettingsData settings = settingsService.getSettings();
|
SettingsData settings = settingsService.getSettings();
|
||||||
|
|||||||
Reference in New Issue
Block a user