Download as
Browse Code »

Commit 27710a6f2f53548af36eb030cc1dfc6b51f77571

Authored by luis.camargo
2 parents 3ddb1408 4a427b1d
Exists in master

Merge branch 'tarefa-4455' of http://ferramentasgo.centralit.com.br:8080/scm/git… 

…/cit-grp-contratos into tarefa-4455

# Conflicts:
#	cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/ContratoController.js
#	cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/TermoReferenciaController.js
#	cit-contratos-web/src/main/webapp/html/termoReferencia/termoReferenciaList.html
Showing 3 changed files with 6 additions and 3 deletions   Show diff stats
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/ContratoController.js
  Diff comments   View file @27710a6
@@ -188,7 +188,8 @@ citApp.controller('ContratoController', ['$scope', '$filter', 'FileUploader', 'C @@ -188,7 +188,8 @@ citApp.controller('ContratoController', ['$scope', '$filter', 'FileUploader', 'C
188 if (rascunho) { 188 if (rascunho) {
189 $scope.contrato = rascunho; 189 $scope.contrato = rascunho;
190 } 190 }
191 - $scope.startTimerIntervalSaveDraft($scope.workspace, $scope.contrato); 191 + $scope.workspace.objetoScope = $scope.contrato;
  192 + $scope.startTimerIntervalSaveDraft($scope.workspace);
192 $scope.edit = true; 193 $scope.edit = true;
193 $scope.setLoading(false); 194 $scope.setLoading(false);
194 }; 195 };
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/EstudoTecnicoController.js
  Diff comments   View file @27710a6
@@ -143,7 +143,8 @@ citApp.controller('EstudoTecnicoController', ['$scope', 'EstudoTecnicoRepository @@ -143,7 +143,8 @@ citApp.controller('EstudoTecnicoController', ['$scope', 'EstudoTecnicoRepository
143 if (rascunho) { 143 if (rascunho) {
144 $scope.estudoTecnico = rascunho; 144 $scope.estudoTecnico = rascunho;
145 } 145 }
146 - $scope.startTimerIntervalSaveDraft($scope.workspace , $scope.estudoTecnico); 146 + $scope.workspace.objetoScope = $scope.estudoTecnico;
  147 + $scope.startTimerIntervalSaveDraft($scope.workspace);
147 $scope.edit = true; 148 $scope.edit = true;
148 $scope.setLoading(false); 149 $scope.setLoading(false);
149 }; 150 };
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/TermoReferenciaController.js
  Diff comments   View file @27710a6
@@ -272,7 +272,8 @@ citApp.controller('TermoReferenciaController', ['$scope', @@ -272,7 +272,8 @@ citApp.controller('TermoReferenciaController', ['$scope',
272 if (rascunho) { 272 if (rascunho) {
273 $scope.termoReferencia = rascunho; 273 $scope.termoReferencia = rascunho;
274 } 274 }
275 - $scope.startTimerIntervalSaveDraft($scope.workspace , $scope.termoReferencia); 275 + $scope.workspace.objetoScope = $scope.termoReferencia;
  276 + $scope.startTimerIntervalSaveDraft($scope.workspace);
276 $scope.edit = true; 277 $scope.edit = true;
277 $scope.setLoading(false); 278 $scope.setLoading(false);
278 }; 279 };