Download as
Browse Code »

Commit 00afd7d95c4028e1972825a7e2a81d46b231a232

Authored by Carlos Alberto
1 parent a57a0b9c
Exists in master

Criação de tipo de dado

Showing 3 changed files with 11 additions and 17 deletions   Show diff stats
cit-esi-api/src/main/java/br/com/centralit/esi/api/data/core/DataObjectUtil.java
  Diff comments   View file @00afd7d
... ... @@ -757,23 +757,16 @@ public final class DataObjectUtil {
757 757 // + " " + rsColumns.getString("NULLABLE") + " " + rsColumns.getString("COLUMN_DEF"));
758 758 }
759 759 rsColumns.close();
  760 + ResultSet rsPK = meta.getPrimaryKeys(rs.getString("TABLE_CAT"), rs.getString("TABLE_SCHEM"), rs.getString("TABLE_NAME"));
  761 + while (rsPK.next()) {
  762 + for (DataColumn dataColumn : columns) {
  763 + if (rsPK.getString("COLUMN_NAME").equalsIgnoreCase(dataColumn.getName()) && rsPK.getString("TABLE_NAME").equalsIgnoreCase(tableName)) {
  764 + dataColumn.setPk(true);
  765 + }
  766 + }
  767 + }
  768 + rsPK.close();
760 769 }
761   - ResultSet rsPK = meta.getPrimaryKeys(rs.getString("TABLE_CAT"), rs.getString("TABLE_SCHEM"), rs.getString("TABLE_NAME"));
762   - while (rsPK.next()) {
763   - for (DataColumn dataColumn : columns) {
764   - if (rsPK.getString("COLUMN_NAME").equalsIgnoreCase(dataColumn.getName()) && rsPK.getString("TABLE_NAME").equalsIgnoreCase(tableName)) {
765   - dataColumn.setPk(true);
766   - }
767   - }
768   - }
769   - rsPK.close();
770   -/* ResultSet rsFK = meta.getCrossReference(rs.getString("TABLE_CAT"), rs.getString("TABLE_SCHEM"), rs.getString("TABLE_NAME"), null, null, null);
771   - while (rsFK.next()) {
772   - for (DataColumn dataColumn : columns) {
773   -
774   - }
775   - }
776   - rsFK.close();*/
777 770 }
778 771 }
779 772 finally {
... ...
cit-esi-web/src/main/java/br/com/centralit/listener/StartupListenerEsi.java
  Diff comments   View file @00afd7d
... ... @@ -1851,6 +1851,7 @@ public class StartupListenerEsi extends UtilStartup implements ApplicationListen
1851 1851 internacionalizacaoList.add(new Internacionalizacao("ESI.CONSEQUENCIAS", "Consequências", dominio, modulo));
1852 1852 internacionalizacaoList.add(new Internacionalizacao("ESI.DADOS", "Dados", dominio, modulo));
1853 1853 internacionalizacaoList.add(new Internacionalizacao("ESI.WORKFLOW_ESI", "Workflow/ESI", dominio, modulo));
  1854 + internacionalizacaoList.add(new Internacionalizacao("ESI.SENHA", "Senha", dominio, modulo));
1854 1855  
1855 1856 internacionalizacaoList.add(new Internacionalizacao("ESI.CONTEXTO_JNDI", "Contexto JNDI", dominio, modulo));
1856 1857 internacionalizacaoList.add(new Internacionalizacao("ESI.VALOR_AUTOMATICO", "Valor atribuído pelo banco", dominio, modulo));
... ...
cit-esi-web/src/main/webapp/html/dataSource/dataSourceEdit.html
  Diff comments   View file @00afd7d
... ... @@ -100,7 +100,7 @@
100 100 </div><!-- .col -->
101 101  
102 102 <div class="col-md-3">
103   - <label-input ng-type='password' ng-id="dataSource.JDBCPassword" ng-label="LABEL.SENHA" ng-model="dataSource.JDBCPassword"
  103 + <label-input ng-type='password' ng-id="dataSource.JDBCPassword" ng-label="ESI.SENHA" ng-model="dataSource.JDBCPassword"
104 104 form="dataSourceForm" ng-obrigatorio="true" ng-custom-maxlength="100" ng-disabled="!edit" />
105 105 </div><!-- .col -->
106 106 </div><!-- .row -->
... ...