Skip to content

Commit dc63dcd

Browse files
committed
[KNOWAGE-9306]refactor: rename isOnlyDevRole to hasADevRole and adjust corresponding logic
1 parent 9f23845 commit dc63dcd

1 file changed

Lines changed: 7 additions & 8 deletions

File tree

knowage-core/src/main/java/it/eng/spagobi/analiticalmodel/execution/service/v2/SaveDocumentResource.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -644,15 +644,15 @@ private BIObject setDocumentState(BIObject document) throws EMFUserError {
644644
}
645645

646646
private BIObject setDocumentState(BIObject document, UserProfile profile) throws EMFUserError {
647-
boolean isOnlyDevRole = false;
647+
boolean hasADevRole = false;
648648
try {
649649
if (profile != null)
650-
isOnlyDevRole = isOnlyDevRole(profile);
650+
hasADevRole = hasADevRole(profile);
651651
} catch (EMFInternalError e) {
652652
throw new SpagoBIServiceException("setDocumentState", "sbi.document.saveError");
653653
}
654654
Domain objState = null;
655-
if (isOnlyDevRole) {
655+
if (hasADevRole) {
656656
objState = DAOFactory.getDomainDAO().loadDomainByCodeAndValue(SpagoBIConstants.DOC_STATE,
657657
SpagoBIConstants.DOC_STATE_DEV);
658658
} else
@@ -665,16 +665,15 @@ private BIObject setDocumentState(BIObject document, UserProfile profile) throws
665665
return document;
666666
}
667667

668-
private boolean isOnlyDevRole(UserProfile profile) throws EMFInternalError, EMFUserError {
669-
boolean onlyDev = true;
668+
private boolean hasADevRole(UserProfile profile) throws EMFInternalError, EMFUserError {
670669
for (Object roleLabel : profile.getRoles()) {
671670
Role role = DAOFactory.getRoleDAO().loadByName(roleLabel.toString());
672-
if (!role.getRoleTypeCD().equals(SpagoBIConstants.ROLE_TYPE_DEV)) {
673-
onlyDev = false;
671+
if (role.getRoleTypeCD().equals(SpagoBIConstants.ROLE_TYPE_DEV)) {
672+
return true;
674673
}
675674

676675
}
677-
return onlyDev;
676+
return false;
678677
}
679678

680679
private BIObject setFolders(BIObject document, List<Integer> functsList) {

0 commit comments

Comments
 (0)