Browse Source

Fix widgets bundle and widget type alias creation.

pull/204/head
Igor Kulikov 9 years ago
parent
commit
2ce15d5f6f
  1. 6
      dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeServiceImpl.java
  2. 5
      dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java

6
dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeServiceImpl.java

@ -124,8 +124,10 @@ public class WidgetTypeServiceImpl implements WidgetTypeService {
if (widgetsBundle == null) {
throw new DataValidationException("Widget type is referencing to non-existent widgets bundle!");
}
String alias = widgetType.getName().toLowerCase().replaceAll("\\W+", "_");
String alias = widgetType.getAlias();
if (alias == null || alias.trim().isEmpty()) {
alias = widgetType.getName().toLowerCase().replaceAll("\\W+", "_");
}
String originalAlias = alias;
int c = 1;
WidgetType withSameAlias;

5
dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java

@ -169,7 +169,10 @@ public class WidgetsBundleServiceImpl implements WidgetsBundleService {
@Override
protected void validateCreate(WidgetsBundle widgetsBundle) {
String alias = widgetsBundle.getTitle().toLowerCase().replaceAll("\\W+", "_");
String alias = widgetsBundle.getAlias();
if (alias == null || alias.trim().isEmpty()) {
alias = widgetsBundle.getTitle().toLowerCase().replaceAll("\\W+", "_");
}
String originalAlias = alias;
int c = 1;
WidgetsBundle withSameAlias;

Loading…
Cancel
Save