Download as
Browse Code »

Commit 5ab2b0d72094ff5f196ee051ac26a023045841cb

Authored by erick.sato
2 parents 91d69436 184267ff
Exists in master

Merge branch 'master' of http://ferramentasgo.centralit.com.br:8080/scm/git/cit-grp-corporativo

Showing 4 changed files with 32 additions and 3 deletions   Show diff stats
cit-core/src/main/java/br/com/centralit/framework/json/Views.java
  Diff comments   View file @5ab2b0d
... ... @@ -383,7 +383,7 @@ public class Views {
383 383  
384 384 public static class ModulosParceiroView extends GenericView{};
385 385  
386   - public static class RequisicaoConsumo extends GenericView{};
  386 + public static class RequisicaoConsumo extends ModulosParceiroView{};
387 387  
388 388 public static class ContratoView extends GenericView{};
389 389  
... ...
cit-core/src/main/java/br/com/centralit/framework/model/Usuario.java
  Diff comments   View file @5ab2b0d
... ... @@ -219,6 +219,10 @@ public class Usuario extends PersistentObjectAudit implements UserDetails {
219 219 @Column
220 220 @JsonView({ Views.UsuarioEditView.class })
221 221 private String passwordCitsmart;
  222 +
  223 + @Column
  224 + @JsonView({ Views.GenericView.class })
  225 + private String nome;
222 226  
223 227 /** Atributo authorities. */
224 228 @Transient
... ... @@ -820,4 +824,26 @@ public class Usuario extends PersistentObjectAudit implements UserDetails {
820 824 this.authorities = authorities;
821 825 }
822 826  
  827 +
  828 + /**
  829 + * Retorna o valor do atributo <code>nome</code>
  830 + *
  831 + * @return <code>String</code>
  832 + */
  833 + public String getNome() {
  834 +
  835 + return nome;
  836 + }
  837 +
  838 +
  839 + /**
  840 + * Define o valor do atributo <code>nome</code>.
  841 + *
  842 + * @param nome
  843 + */
  844 + public void setNome(String nome) {
  845 +
  846 + this.nome = nome;
  847 + }
  848 +
823 849 }
... ...
cit-core/src/main/java/br/com/centralit/framework/model/arquitetura/PersistentObjectAudit.java
  Diff comments   View file @5ab2b0d
... ... @@ -48,8 +48,10 @@ public abstract class PersistentObjectAudit extends PersistentObject {
48 48 @Audited
49 49 @ManyToOne(fetch = FetchType.LAZY)
50 50 @JoinColumn(name = "autor_id", updatable = false)
51   - @JsonView({Views.MapaOrganizacionalListView.class, Views.BaixaAlmoxarifadoView.class, Views.BaixaEditView.class, Views.TransferenciaEditView.class, Views.SaidaTemporariaEditView.class, Views.EntradaEditView.class,
52   - Views.BemPatrimonialAutoCompleteSimplesView.class, Views.EstruturaOrganizacionalAutoCompleteView.class, Views.JustificativaAcaoProcessoView.class, Views.ProcessoEdit.class, Views.ProcessoRelacionadoList.class, Views.AnexarProcesso.class, Views.ProcessoAutoCompleteView.class, Views.ModulosParceiroView.class,Views.HistoricoCredencialProcesso.class, Views.CredencialProcessoView.class, Views.ReabrirProcessoListView.class})
  51 + @JsonView({Views.MapaOrganizacionalListView.class, Views.BaixaAlmoxarifadoView.class, Views.BaixaEditView.class, Views.TransferenciaEditView.class, Views.SaidaTemporariaEditView.class,
  52 + Views.EntradaEditView.class, Views.BemPatrimonialAutoCompleteSimplesView.class, Views.EstruturaOrganizacionalAutoCompleteView.class, Views.JustificativaAcaoProcessoView.class, Views.ProcessoEdit.class,
  53 + Views.ProcessoRelacionadoList.class, Views.AnexarProcesso.class, Views.ProcessoAutoCompleteView.class, Views.ModulosParceiroView.class,Views.HistoricoCredencialProcesso.class,
  54 + Views.CredencialProcessoView.class, Views.ReabrirProcessoListView.class})
53 55 protected Usuario autor;
54 56  
55 57 @Audited
... ...
cit-portal-web/src/main/java/br/com/centralit/listener/StartupListener.java
  Diff comments   View file @5ab2b0d
... ... @@ -1130,6 +1130,7 @@ public class StartupListener extends UtilStartup implements ApplicationListener&lt;
1130 1130 internacionalizacaoList.add(new Internacionalizacao("LABEL.TODOS", "Todos", dominio, modulo));
1131 1131 internacionalizacaoList.add(new Internacionalizacao("LABEL.UNIDADE", "Unidade", dominio, modulo));
1132 1132 internacionalizacaoList.add(new Internacionalizacao("LABEL.UNIDADE_MEDIDA", "Unidade de medida", dominio, modulo));
  1133 + internacionalizacaoList.add(new Internacionalizacao("LABEL.UN_MEDIDA", "Un. medida", dominio, modulo));
1133 1134 internacionalizacaoList.add(new Internacionalizacao("LABEL.UPLOAD_MSG_ARRASTE", "Arraste e solte o arquivo ou clique para escolher", dominio, modulo));
1134 1135 internacionalizacaoList.add(new Internacionalizacao("LABEL.USUARIO", "Usuário", dominio, modulo));
1135 1136 internacionalizacaoList.add(new Internacionalizacao("LABEL.USUARIOS", "Usuários", dominio, modulo));
... ...