Download as
Browse Code »

Commit 1969d838ea79393e2abfacb44c62d29d45076fd2

Authored by luis.camargo
2 parents 449bc0d5 9f164e15
Exists in master

Merge branch 'tarefa-4212' into cnt-1.0.0-alfa11

Showing 2 changed files with 10 additions and 3 deletions   Show diff stats
cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/EventoRepactuacaoServiceImpl.java
  Diff comments   View file @1969d83
@@ -41,7 +41,6 @@ import br.com.centralit.framework.model.Dominio; @@ -41,7 +41,6 @@ import br.com.centralit.framework.model.Dominio;
41 import br.com.centralit.framework.model.Usuario; 41 import br.com.centralit.framework.model.Usuario;
42 import br.com.centralit.framework.service.arquitetura.GenericServiceImpl; 42 import br.com.centralit.framework.service.arquitetura.GenericServiceImpl;
43 import br.com.centralit.framework.util.UtilDataBase; 43 import br.com.centralit.framework.util.UtilDataBase;
44 -import br.com.centralit.framework.util.UtilDate;  
45 import br.com.centralit.framework.util.UtilObjeto; 44 import br.com.centralit.framework.util.UtilObjeto;
46 45
47 46
@@ -108,6 +107,14 @@ public class EventoRepactuacaoServiceImpl extends GenericServiceImpl<EventoRepac @@ -108,6 +107,14 @@ public class EventoRepactuacaoServiceImpl extends GenericServiceImpl<EventoRepac
108 return super.save(eventoRepactuacao); 107 return super.save(eventoRepactuacao);
109 } 108 }
110 109
  110 + @Override
  111 + public EventoRepactuacao merge(EventoRepactuacao eventoRepactuacao) {
  112 + montarObjeto(eventoRepactuacao);
  113 + this.validarEntidade(eventoRepactuacao, this.validator);
  114 +
  115 + EventoRepactuacao entityMerged = super.save(eventoRepactuacao);
  116 + return entityMerged;
  117 + }
111 /** 118 /**
112 * 119 *
113 * @param eventoRepactuacao 120 * @param eventoRepactuacao
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/VisaoContratoController.js
  Diff comments   View file @1969d83
@@ -474,8 +474,8 @@ citApp.controller('VisaoContratoController', ['$scope', @@ -474,8 +474,8 @@ citApp.controller('VisaoContratoController', ['$scope',
474 break; 474 break;
475 case 'REPACTUACAO': 475 case 'REPACTUACAO':
476 $scope.visualizarEvento = true; 476 $scope.visualizarEvento = true;
477 - $scope.editEvento = false;  
478 - $scope.removeEvento = false; 477 + $scope.editEvento = true;
  478 + $scope.removeEvento = true;
479 break; 479 break;
480 case 'RESCISAO': 480 case 'RESCISAO':
481 $scope.visualizarEvento = true; 481 $scope.visualizarEvento = true;