From 9f164e152bd6fce9cc7f996064e14041107e14e6 Mon Sep 17 00:00:00 2001
From: luis.camargo <luis.camargo@centralit.com.br>
Date: Tue, 5 Apr 2016 16:47:33 -0300
Subject: [PATCH] redmine #4329 Construção da história;

---
 cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/EventoRepactuacaoServiceImpl.java |  9 ++++++++-
 cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/VisaoContratoController.js    |  4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/EventoRepactuacaoServiceImpl.java b/cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/EventoRepactuacaoServiceImpl.java
index fbd4e92..7459128 100644
--- a/cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/EventoRepactuacaoServiceImpl.java
+++ b/cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/EventoRepactuacaoServiceImpl.java
@@ -41,7 +41,6 @@ import br.com.centralit.framework.model.Dominio;
 import br.com.centralit.framework.model.Usuario;
 import br.com.centralit.framework.service.arquitetura.GenericServiceImpl;
 import br.com.centralit.framework.util.UtilDataBase;
-import br.com.centralit.framework.util.UtilDate;
 import br.com.centralit.framework.util.UtilObjeto;
 
 
@@ -108,6 +107,14 @@ public class EventoRepactuacaoServiceImpl extends GenericServiceImpl<EventoRepac
 		return super.save(eventoRepactuacao);
 	}
 
+	@Override
+	public EventoRepactuacao merge(EventoRepactuacao eventoRepactuacao) {
+		montarObjeto(eventoRepactuacao);
+		this.validarEntidade(eventoRepactuacao, this.validator);
+		
+		EventoRepactuacao entityMerged = super.save(eventoRepactuacao);
+		return entityMerged;
+	}
 	/**
 	 *
 	 * @param eventoRepactuacao
diff --git a/cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/VisaoContratoController.js b/cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/VisaoContratoController.js
index 0f1e1c5..2545723 100644
--- a/cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/VisaoContratoController.js
+++ b/cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/VisaoContratoController.js
@@ -474,8 +474,8 @@ citApp.controller('VisaoContratoController', ['$scope',
               break;
           case 'REPACTUACAO':
         	  $scope.visualizarEvento = true;
-        	  $scope.editEvento = false;
-              $scope.removeEvento = false;
+        	  $scope.editEvento = true;
+              $scope.removeEvento = true;
               break;
           case 'RESCISAO':
         	  $scope.visualizarEvento = true;
--
libgit2 0.21.2