diff --git a/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/Database.java b/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/Database.java index 2c9926f..47af186 100644 --- a/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/Database.java +++ b/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/Database.java @@ -30,7 +30,7 @@ public class Database extends PersistentObjectAudit { @Id @GeneratedValue(strategy = GenerationType.AUTO) - @JsonView({Views.EsiDataObjectListView.class, Views.EsiDataObjectEditView.class }) + @JsonView({Views.GenericView.class }) protected Long id; @JsonView({ Views.GenericView.class}) @@ -41,11 +41,11 @@ public class Database extends PersistentObjectAudit { private String name; @Column(nullable = false, length=100) - @JsonView({ Views.EsiDataObjectEditView.class, Views.EsiPackageExportView.class}) + @JsonView({ Views.EsiDatabaseEditView.class, Views.EsiPackageExportView.class}) private String driverClassName; @OneToMany(cascade = { CascadeType.ALL }, mappedBy = "database", fetch = FetchType.LAZY) - @JsonView({ Views.EsiDataObjectEditView.class, Views.EsiPackageExportView.class}) + @JsonView({ Views.EsiPackageExportView.class, Views.EsiDatabaseEditView.class}) private List types; @Override diff --git a/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DatabaseDomain.java b/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DatabaseDomain.java index ef54961..f6956d9 100644 --- a/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DatabaseDomain.java +++ b/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/model/DatabaseDomain.java @@ -40,7 +40,7 @@ public class DatabaseDomain extends PersistentObject { private Database database; @ManyToOne(fetch = FetchType.LAZY, optional = false) - @JsonView({ Views.EsiDataObjectListView.class, Views.EsiDataObjectEditView.class, Views.EsiPackageExportView.class}) + @JsonView({ Views.EsiPackageExportView.class, Views.EsiDatabaseEditView.class}) private DataType dataType; public DatabaseDomain() { @@ -86,4 +86,5 @@ public class DatabaseDomain extends PersistentObject { this.name = name; } + } diff --git a/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/service/impl/DataObjectServiceImpl.java b/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/service/impl/DataObjectServiceImpl.java index 1af4fc4..9a47e99 100644 --- a/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/service/impl/DataObjectServiceImpl.java +++ b/cit-esi-api/src/main/java/br/com/centralit/esi/api/data/service/impl/DataObjectServiceImpl.java @@ -297,10 +297,12 @@ public class DataObjectServiceImpl extends GenericServiceImpl if (dataObject.getColumns() != null) { for (DataColumn column : dataObject.getColumns()) { column.setDataObject(dataObject); - if (column.getWidget() == null) { + if (column.getWidget() == null && column.getType() != null) { column.setWidget(column.getType().getWidget()); } - column.setWidget(formWidgetService.find(column.getWidget().getId())); + if (column.getWidget() != null) { + column.setWidget(formWidgetService.find(column.getWidget().getId())); + } } } diff --git a/cit-esi-api/src/main/resources/scripts-bd/script alteracao_datatype_esi.sql b/cit-esi-api/src/main/resources/scripts-bd/script alteracao_datatype_esi.sql new file mode 100644 index 0000000..7e425f6 --- /dev/null +++ b/cit-esi-api/src/main/resources/scripts-bd/script alteracao_datatype_esi.sql @@ -0,0 +1,6 @@ +delete from esi_databasedomain; + +update esi_datatype set name = 'boolean' where name = 'bit'; +update esi_datatype set name = 'bigdecimal' where name = 'decimal'; +update esi_datatype set name = 'currency' where name = 'money'; +update esi_datatype set name = 'log' where name = 'image'; diff --git a/cit-esi-web/src/main/java/br/com/centralit/controller/DatabaseController.java b/cit-esi-web/src/main/java/br/com/centralit/controller/DatabaseController.java index d21bbb3..339852f 100644 --- a/cit-esi-web/src/main/java/br/com/centralit/controller/DatabaseController.java +++ b/cit-esi-web/src/main/java/br/com/centralit/controller/DatabaseController.java @@ -25,12 +25,12 @@ public class DatabaseController extends GenericController{ @Override public Class getListView() { - return Views.EsiDataObjectListView.class; + return Views.EsiDatabaseListView.class; } @Override public Class getEditView() { - return Views.EsiDataObjectEditView.class; + return Views.EsiDatabaseEditView.class; } } diff --git a/cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java b/cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java index 8cc7be6..e8debad 100644 --- a/cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java +++ b/cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java @@ -213,10 +213,7 @@ public class StartupListenerEsi extends UtilStartup implements ApplicationListen this.createDatabases(); - List datatypes = dataTypeService.findAll(); - if (datatypes == null || datatypes.size() == 0) { - this.createDatatypes(); - } + this.createDatatypes(); List flows = flowService.findAll(); if (flows == null || flows.size() == 0) { @@ -333,108 +330,154 @@ public class StartupListenerEsi extends UtilStartup implements ApplicationListen FormWidget widgetTextArea = formWidgetService.findByName("text-area"); // name, description, javaClass, allowSize, allowGeneratedValue, allowPrecision, allowAutoIncrement, width, widget - DataType dataType = new DataType("bigint", "Big integer", JavaClassEnum.BIG_INTEGER, false, true, false, true, 2, widgetInteger); - dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(sqlServer, "bigint", dataType)); - databaseDomainService.save(new DatabaseDomain(mySQL, "bigint", dataType)); - databaseDomainService.save(new DatabaseDomain(postgres, "bigint", dataType)); - databaseDomainService.save(new DatabaseDomain(postgres, "int8", dataType)); - databaseDomainService.save(new DatabaseDomain(oracle, "integer", dataType)); - - dataType = new DataType("int", "Small integer", JavaClassEnum.INTEGER, false, true, false, true, 2, widgetInteger); - dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(sqlServer, "int", dataType)); - databaseDomainService.save(new DatabaseDomain(sqlServer, "smallint", dataType)); - databaseDomainService.save(new DatabaseDomain(mySQL, "smallint", dataType)); - databaseDomainService.save(new DatabaseDomain(mySQL, "int", dataType)); - databaseDomainService.save(new DatabaseDomain(postgres, "smallint", dataType)); - databaseDomainService.save(new DatabaseDomain(oracle, "integer", dataType)); - - dataType = new DataType("integer", "Integer", JavaClassEnum.INTEGER, false, true, false, true, 2, widgetInteger); - dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(sqlServer, "integer", dataType)); - databaseDomainService.save(new DatabaseDomain(mySQL, "int", dataType)); - databaseDomainService.save(new DatabaseDomain(postgres, "integer", dataType)); - databaseDomainService.save(new DatabaseDomain(oracle, "integer", dataType)); - - dataType = new DataType("boolean", "Boolean", JavaClassEnum.BOOLEAN, false, false, false, false, 2, widgetCheckbox); - dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(sqlServer, "bit", dataType)); - databaseDomainService.save(new DatabaseDomain(mySQL, "bit", dataType)); - databaseDomainService.save(new DatabaseDomain(postgres, "bool", dataType)); - databaseDomainService.save(new DatabaseDomain(oracle, "integer", dataType)); - - dataType = new DataType("bigdecimal", "Big decimal", JavaClassEnum.BIG_DECIMAL, true, false, true, false, 2, widgetDecimal); - dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(sqlServer, "float", dataType)); - databaseDomainService.save(new DatabaseDomain(sqlServer, "numeric", dataType)); - databaseDomainService.save(new DatabaseDomain(sqlServer, "decimal", dataType)); - databaseDomainService.save(new DatabaseDomain(mySQL, "float", dataType)); - databaseDomainService.save(new DatabaseDomain(mySQL, "numeric", dataType)); - databaseDomainService.save(new DatabaseDomain(mySQL, "decimal", dataType)); - databaseDomainService.save(new DatabaseDomain(postgres, "numeric", dataType)); - databaseDomainService.save(new DatabaseDomain(oracle, "number", dataType)); - - dataType = new DataType("float", "Float", JavaClassEnum.FLOAT, true, false, true, false, 2, widgetDecimal); - dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(sqlServer, "float", dataType)); - databaseDomainService.save(new DatabaseDomain(sqlServer,"real", dataType)); - databaseDomainService.save(new DatabaseDomain(mySQL, "double", dataType)); - databaseDomainService.save(new DatabaseDomain(postgres, "numeric", dataType)); - databaseDomainService.save(new DatabaseDomain(postgres,"real", dataType)); - databaseDomainService.save(new DatabaseDomain(oracle, "number", dataType)); - - dataType = new DataType("currency", "Currency", JavaClassEnum.CURRENCY, false, false, false, false, 2, widgetMoney); - dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(sqlServer, "money", dataType)); - databaseDomainService.save(new DatabaseDomain(sqlServer, "smallmoney", dataType)); - databaseDomainService.save(new DatabaseDomain(mySQL, "float", dataType)); - databaseDomainService.save(new DatabaseDomain(postgres, "money", dataType)); - databaseDomainService.save(new DatabaseDomain(oracle, "number", dataType)); - - dataType = new DataType("date", "Date", JavaClassEnum.DATE, false, false, false, false, 2, widgetDate); - dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(sqlServer, "datetime", dataType)); - databaseDomainService.save(new DatabaseDomain(sqlServer, "smalldatetime", dataType)); - databaseDomainService.save(new DatabaseDomain(mySQL, "datetime", dataType)); - databaseDomainService.save(new DatabaseDomain(postgres, "date", dataType)); - databaseDomainService.save(new DatabaseDomain(oracle, "date", dataType)); - - dataType = new DataType("datetime", "Datetime", JavaClassEnum.DATE, false, false, false, false, 2, widgetDate); - dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(sqlServer, "datetime", dataType)); - databaseDomainService.save(new DatabaseDomain(mySQL, "timestamp", dataType)); - databaseDomainService.save(new DatabaseDomain(postgres, "timestamp", dataType)); - databaseDomainService.save(new DatabaseDomain(oracle, "timestamp", dataType)); - - dataType = new DataType("char", "Character", JavaClassEnum.STRING, true, false, false, false, 4, widgetText); - dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(sqlServer, "char", dataType)); - databaseDomainService.save(new DatabaseDomain(sqlServer, "nchar", dataType)); - databaseDomainService.save(new DatabaseDomain(mySQL, "char", dataType)); - databaseDomainService.save(new DatabaseDomain(postgres, "character", dataType)); - databaseDomainService.save(new DatabaseDomain(oracle, "char", dataType)); - databaseDomainService.save(new DatabaseDomain(oracle, "nchar", dataType)); - - dataType = new DataType("varchar", "Text", JavaClassEnum.STRING, true, false, false, false, 4, widgetText); - dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(sqlServer, "varchar", dataType)); - databaseDomainService.save(new DatabaseDomain(sqlServer, "nvarchar", dataType)); - databaseDomainService.save(new DatabaseDomain(sqlServer, "varchar(max)", dataType)); - databaseDomainService.save(new DatabaseDomain(mySQL, "varchar", dataType)); - databaseDomainService.save(new DatabaseDomain(postgres, "varchar", dataType)); - databaseDomainService.save(new DatabaseDomain(oracle, "varchar2", dataType)); - databaseDomainService.save(new DatabaseDomain(oracle, "nvarchar2", dataType)); - databaseDomainService.save(new DatabaseDomain(oracle, "varchar", dataType)); - - dataType = new DataType("text", "Long text", JavaClassEnum.STRING, true, false, false, false, 6, widgetTextArea); - dataType = dataTypeService.save(dataType); - databaseDomainService.save(new DatabaseDomain(sqlServer, "text", dataType)); - databaseDomainService.save(new DatabaseDomain(sqlServer, "ntext", dataType)); - databaseDomainService.save(new DatabaseDomain(mySQL, "text", dataType)); - databaseDomainService.save(new DatabaseDomain(postgres, "text", dataType)); - databaseDomainService.save(new DatabaseDomain(oracle, "clob", dataType)); - databaseDomainService.save(new DatabaseDomain(oracle, "nclob", dataType)); + DataType dataType = dataTypeService.findByName("bigint"); + if (dataType == null) { + dataType = new DataType("bigint", "Big integer", JavaClassEnum.BIG_INTEGER, false, true, false, true, 2, widgetInteger); + dataType = dataTypeService.save(dataType); + } + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "bigint", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "bigint", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "bigint", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "int8", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "integer", dataType)); + + dataType = dataTypeService.findByName("int"); + if (dataType == null) { + dataType = new DataType("int", "Small integer", JavaClassEnum.INTEGER, false, true, false, true, 2, widgetInteger); + dataType = dataTypeService.save(dataType); + } + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "int", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "smallint", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "smallint", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "int", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "smallint", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "integer", dataType)); + + dataType = dataTypeService.findByName("integer"); + if (dataType == null) { + dataType = new DataType("integer", "Integer", JavaClassEnum.INTEGER, false, true, false, true, 2, widgetInteger); + dataType = dataTypeService.save(dataType); + } + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "integer", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "int", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "integer", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "integer", dataType)); + + dataType = dataTypeService.findByName("boolean"); + if (dataType == null) { + dataType = new DataType("boolean", "Boolean", JavaClassEnum.BOOLEAN, false, false, false, false, 2, widgetCheckbox); + dataType = dataTypeService.save(dataType); + } + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "bit", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "bit", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "bool", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "integer", dataType)); + + dataType = dataTypeService.findByName("bigdecimal"); + if (dataType == null) { + dataType = new DataType("bigdecimal", "Big decimal", JavaClassEnum.BIG_DECIMAL, true, false, true, false, 2, widgetDecimal); + dataType = dataTypeService.save(dataType); + } + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "float", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "numeric", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "decimal", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "float", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "numeric", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "decimal", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "numeric", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "number", dataType)); + + dataType = dataTypeService.findByName("float"); + if (dataType == null) { + dataType = new DataType("float", "Decimal", JavaClassEnum.FLOAT, true, false, true, false, 2, widgetDecimal); + dataType = dataTypeService.save(dataType); + } + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "float", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer,"real", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "double", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "numeric", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres,"real", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "number", dataType)); + + dataType = dataTypeService.findByName("currency"); + if (dataType == null) { + dataType = new DataType("currency", "Currency", JavaClassEnum.CURRENCY, false, false, false, false, 2, widgetMoney); + dataType = dataTypeService.save(dataType); + } + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "money", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "smallmoney", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "float", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "money", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "number", dataType)); + + dataType = dataTypeService.findByName("date"); + if (dataType == null) { + dataType = new DataType("date", "Date", JavaClassEnum.DATE, false, false, false, false, 2, widgetDate); + dataType = dataTypeService.save(dataType); + } + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "datetime", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "smalldatetime", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "datetime", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "date", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "date", dataType)); + + dataType = dataTypeService.findByName("datetime"); + if (dataType == null) { + dataType = new DataType("datetime", "Datetime", JavaClassEnum.DATE, false, false, false, false, 2, widgetDate); + dataType = dataTypeService.save(dataType); + } + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "datetime", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "timestamp", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "timestamp", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "timestamp", dataType)); + + dataType = dataTypeService.findByName("char"); + if (dataType == null) { + dataType = new DataType("char", "Character", JavaClassEnum.STRING, true, false, false, false, 4, widgetText); + dataType = dataTypeService.save(dataType); + } + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "char", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "nchar", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "char", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "character", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "char", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "nchar", dataType)); + + dataType = dataTypeService.findByName("varchar"); + if (dataType == null) { + dataType = new DataType("varchar", "Text", JavaClassEnum.STRING, true, false, false, false, 4, widgetText); + dataType = dataTypeService.save(dataType); + } + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "varchar", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "nvarchar", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "varchar(max)", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "varchar", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "varchar", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "varchar2", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "nvarchar2", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "varchar", dataType)); + + dataType = dataTypeService.findByName("text"); + if (dataType == null) { + dataType = new DataType("text", "Long text", JavaClassEnum.STRING, true, false, false, false, 6, widgetTextArea); + dataType = dataTypeService.save(dataType); + } + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "text", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "ntext", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "text", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "text", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "clob", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "nclob", dataType)); + + dataType = dataTypeService.findByName("lob"); + if (dataType == null) { + dataType = new DataType("lob", "Lob", JavaClassEnum.STRING, true, false, false, false, 6, widgetTextArea); + dataType = dataTypeService.save(dataType); + } + databaseDomainService.saveIfNotExist(new DatabaseDomain(sqlServer, "text", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(mySQL, "text", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(postgres, "text", dataType)); + databaseDomainService.saveIfNotExist(new DatabaseDomain(oracle, "clob", dataType)); } private void createDatabases() { diff --git a/cit-esi-web/src/main/webapp/assets/js/angular/custom/controller/DataObjectController.js b/cit-esi-web/src/main/webapp/assets/js/angular/custom/controller/DataObjectController.js index e2743d5..efb7cd8 100644 --- a/cit-esi-web/src/main/webapp/assets/js/angular/custom/controller/DataObjectController.js +++ b/cit-esi-web/src/main/webapp/assets/js/angular/custom/controller/DataObjectController.js @@ -1,7 +1,7 @@ 'use strict'; -citApp.controller('DataObjectController', ["$scope", "FlowRepository", "DataObjectRepository", "DataSourceRepository", "DataTypeRepository", "ParameterRepository", "FormWidgetRepository", "FormBuilderRepository", "MenuRepository", "appService", "$filter", "$translate", "DomainRepository", "$timeout", "$rootScope", "$modal", - function DataObjectController($scope, FlowRepository, DataObjectRepository, DataSourceRepository, DataTypeRepository, ParameterRepository, FormWidgetRepository, FormBuilderRepository, MenuRepository, appService, $filter, $translate, DomainRepository, $timeout, $rootScope, $modal) { +citApp.controller('DataObjectController', ["$scope", "FlowRepository", "DataObjectRepository", "DataSourceRepository", "DatabaseRepository", "DataTypeRepository", "ParameterRepository", "FormWidgetRepository", "FormBuilderRepository", "MenuRepository", "appService", "$filter", "$translate", "DomainRepository", "$timeout", "$rootScope", "$modal", + function DataObjectController($scope, FlowRepository, DataObjectRepository, DataSourceRepository, DatabaseRepository, DataTypeRepository, ParameterRepository, FormWidgetRepository, FormBuilderRepository, MenuRepository, appService, $filter, $translate, DomainRepository, $timeout, $rootScope, $modal) { var componentsPage = '/cit-esi-web/assets/js/angular/custom/directive/html/formComponents.html'; $scope.appController = angular.element("#citapp-controller").scope(); @@ -229,7 +229,9 @@ citApp.controller('DataObjectController', ["$scope", "FlowRepository", "DataObje $scope.getDatabaseDomains = function(dataSource) { $scope.databaseDomains = []; DataSourceRepository.get(dataSource.id).then(function(result) { - $scope.databaseDomains = result.database.types; + DatabaseRepository.get(dataSource.database.id).then(function(result) { + $scope.databaseDomains = result.types; + }); }); }; @@ -608,7 +610,7 @@ citApp.controller('DataObjectController', ["$scope", "FlowRepository", "DataObje }); $scope.column.databaseType = ''; angular.forEach($scope.databaseDomains, function(domain){ - if (domain.dataType.id == type.id && $scope.column.databaseType == '') { + if (domain.dataType_id == type.id && $scope.column.databaseType == '') { $scope.column.databaseType = domain.name; } }); -- libgit2 0.21.2