Skip to content

Commit cdc039c

Browse files
Refactor entity file access to simplify URL retrieval in DTOs and YAML configurations
1 parent a39a16b commit cdc039c

7 files changed

Lines changed: 7 additions & 9 deletions

File tree

extensions/entity-files/sources/core/src/main/java/tools/dynamia/modules/entityfile/DTOEntityFileToStringProperty.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public boolean transferPropertyValue(Object dto, Object propertyValue, PropertyI
3737
PropertyInfo dtoProperty = ObjectOperations.getPropertyInfo(dto.getClass(), propertyInfo.getName());
3838
if (dtoProperty != null && dtoProperty.is(String.class)) {
3939
try {
40-
String url = entityFile.getStoredEntityFile().getUrl();
40+
String url = entityFile.getUrl();
4141
ObjectOperations.setFieldValue(dtoProperty, dto, url);
4242
return true;
4343
} catch (Exception e) {

extensions/entity-files/sources/ui/src/main/java/tools/dynamia/modules/entityfile/ui/actions/DownloadFileAction.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import tools.dynamia.actions.ActionGroup;
2323
import tools.dynamia.actions.InstallAction;
2424
import tools.dynamia.actions.ReadableOnly;
25-
import tools.dynamia.modules.entityfile.StoredEntityFile;
2625
import tools.dynamia.modules.entityfile.domain.EntityFile;
2726
import tools.dynamia.ui.MessageType;
2827
import tools.dynamia.ui.UIMessages;

extensions/saas/sources/core/src/main/java/tools/dynamia/modules/saas/domain/Account.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ public EntityFile getLogo() {
413413
public void setLogo(EntityFile logo) {
414414
this.logo = logo;
415415
if (logo != null && logo.getName() != null) {
416-
logoURL = logo.getStoredEntityFile().getThumbnailUrl();
416+
logoURL = logo.getThumbnailUrl();
417417
if (logoURL != null && logoURL.length() > 600) {
418418
logoURL = null;
419419
}
@@ -538,7 +538,7 @@ public AccountDTO toDTO() {
538538

539539
String logoURL = null;
540540
if (logo != null) {
541-
logoURL = logo.getStoredEntityFile().getThumbnailUrl(200, 200);
541+
logoURL = logo.getThumbnailUrl(200, 200);
542542
}
543543
dto.setLogo(logoURL);
544544
dto.setType(getType().toDTO());
@@ -887,7 +887,7 @@ public void setChannel(AccountSaleChannel channel) {
887887

888888
public String getLogoURL() {
889889
if (logoURL == null && logo != null) {
890-
logoURL = logo.getStoredEntityFile().getThumbnailUrl();
890+
logoURL = logo.getThumbnailUrl();
891891
}
892892
return logoURL;
893893
}

extensions/saas/sources/ui/src/main/java/tools/dynamia/modules/saas/ui/action/ViewAccountLogoAction.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ private void showLogo(Account account) {
6565
if (account.getLogo() == null) {
6666
UIMessages.showMessage("La cuenta seleccionada no tiene logo", MessageType.WARNING);
6767
} else {
68-
System.out.println(account.getLogo().getStoredEntityFile().getThumbnailUrl());
6968
EntityFileImage image = new EntityFileImage();
7069
image.setValue(account.getLogo());
7170

extensions/saas/sources/ui/src/main/resources/META-INF/descriptors/AccountTableMobile.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fields:
1616
title: name
1717
subtitle: email
1818
description: type
19-
imageURL: logo.storedEntityFile.thumbnailUrl
19+
imageURL: logo.thumbnailUrl
2020
status:
2121
component: enumlabel
2222
params:

extensions/security/sources/ui/src/main/resources/META-INF/descriptors/UserTable.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fields:
1313
title: username
1414
subtitle: fullname
1515
description: email
16-
imageURL: photo.storedEntityFile.thumbnailUrl
16+
imageURL: photo.thumbnailUrl
1717

1818
enabled:
1919
params:

extensions/security/sources/ui/src/main/resources/META-INF/descriptors/UserTableMobile.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fields:
1313
title: username
1414
subtitle: fullname
1515
description: email
16-
imageURL: photo.storedEntityFile.thumbnailUrl
16+
imageURL: photo.thumbnailUrl
1717

1818

1919
enabled:

0 commit comments

Comments
 (0)