From 0287d62964407d273860b8d5517528020c101dca Mon Sep 17 00:00:00 2001
From: ciro.junior <ciro.junior@centralit.com.br>
Date: Fri, 15 Apr 2016 18:10:19 -0300
Subject: [PATCH] [Redmine #4466] Corrigindo comportamento do uploader de imagem.

---
 cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/TarjaAssinaturaServiceImpl.java  |   9 +++++++--
 cit-ecm-web/src/main/java/br/com/centralit/controller/TarjaAssinaturaController.java         |   2 +-
 cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaController.js | 143 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------
 cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/TarjaAssinaturaRepository.js |   4 ++++
 cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaEdit.html                    |  74 ++++++++++++++++++++++++++++++++++----------------------------------------
 5 files changed, 120 insertions(+), 112 deletions(-)

diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/TarjaAssinaturaServiceImpl.java b/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/TarjaAssinaturaServiceImpl.java
index fe76bef..6bd7cbe 100644
--- a/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/TarjaAssinaturaServiceImpl.java
+++ b/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/TarjaAssinaturaServiceImpl.java
@@ -14,6 +14,7 @@ import org.springframework.web.multipart.MultipartFile;
 import br.com.centralit.api.dao.TarjaAssinaturaDao;
 import br.com.centralit.api.model.TarjaAssinatura;
 import br.com.centralit.api.model.TarjaAssinaturaVH;
+import br.com.centralit.api.service.AnexoImagemService;
 import br.com.centralit.api.service.OrganizacaoService;
 import br.com.centralit.api.service.TarjaAssinaturaService;
 import br.com.centralit.framework.model.AnexoImagem;
@@ -42,6 +43,9 @@ public class TarjaAssinaturaServiceImpl extends GenericServiceImpl<TarjaAssinatu
 	@Autowired
 	private OrganizacaoService organizacaoService;
 
+	@Autowired
+	private AnexoImagemService anexoImagemService;
+
 	private TarjaAssinaturaDao tarjaAssinaturaDao;
 
 	@Autowired
@@ -77,8 +81,9 @@ public class TarjaAssinaturaServiceImpl extends GenericServiceImpl<TarjaAssinatu
 			anexoImagem.setDescricao(file.getOriginalFilename());
 			anexoImagem.setOrganizacao(organizacao);
 
-			TarjaAssinatura tarjaAssinatura = (TarjaAssinatura) this.tarjaAssinaturaDao.getReference(idTarjaAssinatura);
-			tarjaAssinatura.setAnexoImagem(anexoImagem);
+			AnexoImagem anexoImagemSaved = anexoImagemService.save(anexoImagem);
+			TarjaAssinatura tarjaAssinatura = (TarjaAssinatura) this.tarjaAssinaturaDao.find(idTarjaAssinatura);
+			tarjaAssinatura.setAnexoImagem(anexoImagemSaved);
 			this.merge(tarjaAssinatura);
 		} catch (IOException ioe) {
 			LOG.error("N\u00e3o consegui anexar a imagem \u00e0 entidade TarjaAssinatura. Verifique a exce\u00e7\u00e3o para "
diff --git a/cit-ecm-web/src/main/java/br/com/centralit/controller/TarjaAssinaturaController.java b/cit-ecm-web/src/main/java/br/com/centralit/controller/TarjaAssinaturaController.java
index 6f4ef16..adc622d 100644
--- a/cit-ecm-web/src/main/java/br/com/centralit/controller/TarjaAssinaturaController.java
+++ b/cit-ecm-web/src/main/java/br/com/centralit/controller/TarjaAssinaturaController.java
@@ -53,7 +53,7 @@ public class TarjaAssinaturaController extends GenericController<TarjaAssinatura
 	}
 
 	@ResponseBody
-	@RequestMapping(value = "save", method = RequestMethod.POST, produces = "application/json")
+	@RequestMapping(value = "/saveTarjaAssinatura", method = RequestMethod.POST, produces = "application/json")
 	public ResponseBodyWrapper save(@RequestBody TarjaAssinaturaVH tarjaAssinaturaVH) throws Exception {
 
 		ResponseBodyWrapper responseBody = new ResponseBodyWrapper(this.tarjaAssinaturaService.save(tarjaAssinaturaVH), getEditView());
diff --git a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaController.js b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaController.js
index 6921d53..d2cd232 100644
--- a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaController.js
+++ b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaController.js
@@ -16,25 +16,26 @@ citApp.controller('TarjaAssinaturaController',
                                                      DominioRepository,
                                                      FileUploader) {
 
+
   $scope.resetForm = function() {
-    $scope.tarjaAssinatura = {
-        assinaturaInterna : {},
-        assinaturaCertificado : {}
-    };
-    $scope.tipoAssinaturaInterna = {};
-    $scope.tipoAssinaturaCertificado = {};
-
-    $scope.edit = false;
-    $timeout(function(){
-      if($scope.tarjaAssinaturaInternaForm && $scope.tarjaAssinaturaCertificadoForm){
-        $scope.tarjaAssinaturaInternaForm.$submitted = false;
-        $scope.tarjaAssinaturaCertificadoForm.$submitted = false;
-        $scope.tarjaAssinaturaInternaForm.$setPristine();
-        $scope.tarjaAssinaturaCertificadoForm.$setPristine();
+      $scope.tarjaAssinatura = {
+          assinaturaInterna : {tipoAssinatura : $scope.tipoAssinaturaInterna},
+          assinaturaCertificado : {tipoAssinatura : $scope.tipoAssinaturaCertificado}
+      };
+      if ($scope.uploaderLogoTarjaAssinaturaInterna && $scope.uploaderLogoTarjaAssinaturaCertificado){
+        $scope.uploaderLogoTarjaAssinaturaInterna.clearQueue();
+        $scope.uploaderLogoTarjaAssinaturaCertificado.clearQueue();
       }
-    });
-  };
-  $scope.resetForm();
+
+      $scope.edit = true;
+      $timeout(function(){
+        if($scope.tarjaAssinaturaForm){
+          $scope.tarjaAssinaturaForm.$submitted = false;
+          $scope.tarjaAssinaturaForm.$setPristine();
+        }
+      });
+    };
+    $scope.resetForm();
 
   DominioRepository.buscaDominioByCodigoAndChave(1, 'tipoAssinatura').then(function(result) {
     $scope.tipoAssinaturaInterna = result.originalElement;
@@ -43,21 +44,29 @@ citApp.controller('TarjaAssinaturaController',
     $scope.tipoAssinaturaCertificado = result.originalElement;
   });
 
+  var vincularIdTarjaUploader = function () {
+    if($scope.tarjaAssinatura.assinaturaInterna.id && $scope.tarjaAssinatura.assinaturaCertificado.id){
+      $scope.uploaderLogoTarjaAssinaturaInterna.url += $scope.tarjaAssinatura.assinaturaInterna.id;
+      $scope.uploaderLogoTarjaAssinaturaCertificado.url += $scope.tarjaAssinatura.assinaturaCertificado.id;
+    }
+  };
+
   $scope.getAllTarjas = function(){
-      $scope.setLoadingGet(true);
-      TarjaAssinaturaRepository.getAllTarjas().then(function(result) {
-        $scope.tarjaAssinatura = result.originalElement;
-        $scope.setLoading(false);
-      });
-    };
+    $scope.setLoadingGet(true);
+    TarjaAssinaturaRepository.getAllTarjas().then(function(result) {
+      $scope.tarjaAssinatura = result.originalElement;
+      vincularIdTarjaUploader();
+      $scope.edit = false;
+      $scope.setLoading(false);
+    });
+  };
     $scope.getAllTarjas();
 
-  $scope.saveOrUpdate = function(formAssinaturaInterna, formAssinaturaCertificado){
+  $scope.saveOrUpdate = function(){
 
-    formAssinaturaInterna.$submitted = true;
-    formAssinaturaCertificado.$submitted = true;
+    $scope.tarjaAssinaturaForm.$submitted = true;
 
-    if(formAssinaturaInterna.$invalid || formAssinaturaCertificado.$invalid){
+    if($scope.tarjaAssinaturaForm.$invalid){
         $scope.showAlert('error', $translate.instant('MSG.MN001'), " ", false);
         return;
     }
@@ -67,12 +76,11 @@ citApp.controller('TarjaAssinaturaController',
     TarjaAssinaturaRepository.save($scope.tarjaAssinatura).then(function(result) {
       $scope.tarjaAssinatura = result.originalElement;
       $scope.showAlert("success", $translate.instant('MSG.REGISTRO_SALVO'));
-      formAssinaturaInterna.$submitted = false;
-      formAssinaturaCertificado.$submitted = false;
+      $scope.tarjaAssinaturaForm.$submitted = false;
       $scope.setLoading(false);
-      if(uploaderLogoTarjaAssinaturaInterna.queue.length > 0 || uploaderLogoTarjaAssinaturaCertificado > 0){
-        uploaderLogoTarjaAssinaturaInterna.uploadAll();
-        uploaderLogoTarjaAssinaturaCertificado.uploadAll();
+      if($scope.uploaderLogoTarjaAssinaturaInterna.queue.length > 0 || $scope.uploaderLogoTarjaAssinaturaCertificado.queue.length > 0){
+        $scope.uploaderLogoTarjaAssinaturaInterna.uploadAll();
+        $scope.uploaderLogoTarjaAssinaturaCertificado.uploadAll();
       }
     });
   };
@@ -84,15 +92,14 @@ citApp.controller('TarjaAssinaturaController',
   }
 
 //INSTANCIA DO OBJETO PARA FAZER UPLOAD
-  var uploaderLogoTarjaAssinaturaInterna = $scope.uploaderLogoTarjaAssinaturaInterna = new FileUploader({
+  $scope.uploaderLogoTarjaAssinaturaInterna = new FileUploader({
     autoUpload: false,
     queueLimit: 1,
-    url : '/cit-ecm-web/rest/tarjaAssinatura/uploadFileLogo?idOrganizacao=' + $scope.usuarioLogado.organizacao.id +
-          '&idTarjaAssinatura=' + $scope.tarjaAssinatura.assinaturaInterna.id
+    url : '/cit-ecm-web/rest/tarjaAssinatura/uploadFileLogo?idOrganizacao=' + $scope.usuarioLogado.organizacao.id + '&idTarjaAssinatura='
   });
 
   // FILTERS
-  uploaderLogoTarjaAssinaturaInterna.filters.push({
+  $scope.uploaderLogoTarjaAssinaturaInterna.filters.push({
     name: 'imageFilter',
     fn: function(item , options) {
       var type = '|' + item.type.slice(item.type.lastIndexOf('/') + 1) + '|';
@@ -101,53 +108,52 @@ citApp.controller('TarjaAssinaturaController',
   });
 
   // CALLBACKS
-  uploaderLogoTarjaAssinaturaInterna.onWhenAddingFileFailed = function(item , filter, options) {
-    uploaderLogoTarjaAssinaturaInterna.clearQueue();
+  $scope.uploaderLogoTarjaAssinaturaInterna.onWhenAddingFileFailed = function(item , filter, options) {
+    $scope.uploaderLogoTarjaAssinaturaInterna.clearQueue();
     console.info('onWhenAddingFileFailed', item, filter, options);
   };
-  uploaderLogoTarjaAssinaturaInterna.onAfterAddingFile = function(fileItem) {
+  $scope.uploaderLogoTarjaAssinaturaInterna.onAfterAddingFile = function(fileItem) {
     console.info('onAfterAddingFile', fileItem);
   };
-  uploaderLogoTarjaAssinaturaInterna.onAfterAddingAll = function(addedFileItems) {
+  $scope.uploaderLogoTarjaAssinaturaInterna.onAfterAddingAll = function(addedFileItems) {
     console.info('onAfterAddingAll', addedFileItems);
   };
-  uploaderLogoTarjaAssinaturaInterna.onBeforeUploadItem = function(item) {
+  $scope.uploaderLogoTarjaAssinaturaInterna.onBeforeUploadItem = function(item) {
     console.info('onBeforeUploadItem', item);
   };
-  uploaderLogoTarjaAssinaturaInterna.onProgressItem = function(fileItem, progress) {
+  $scope.uploaderLogoTarjaAssinaturaInterna.onProgressItem = function(fileItem, progress) {
     console.info('onProgressItem', fileItem, progress);
   };
-  uploaderLogoTarjaAssinaturaInterna.onProgressAll = function(progress) {
+  $scope.uploaderLogoTarjaAssinaturaInterna.onProgressAll = function(progress) {
     console.info('onProgressAll', progress);
   };
-  uploaderLogoTarjaAssinaturaInterna.onSuccessItem = function(fileItem, response, status, headers) {
+  $scope.uploaderLogoTarjaAssinaturaInterna.onSuccessItem = function(fileItem, response, status, headers) {
     console.info('onSuccessItem', fileItem, response, status, headers);
   };
-  uploaderLogoTarjaAssinaturaInterna.onErrorItem = function(fileItem, response, status, headers) {
+  $scope.uploaderLogoTarjaAssinaturaInterna.onErrorItem = function(fileItem, response, status, headers) {
     console.info('onErrorItem', fileItem, response, status, headers);
   };
-  uploaderLogoTarjaAssinaturaInterna.onCancelItem = function(fileItem, response, status, headers) {
+  $scope.uploaderLogoTarjaAssinaturaInterna.onCancelItem = function(fileItem, response, status, headers) {
     console.info('onCancelItem', fileItem, response, status, headers);
   };
-  uploaderLogoTarjaAssinaturaInterna.onCompleteItem = function(fileItem, response, status, headers) {
+  $scope.uploaderLogoTarjaAssinaturaInterna.onCompleteItem = function(fileItem, response, status, headers) {
     console.info('onCompleteItem', fileItem, response, status, headers);
   };
-  uploaderLogoTarjaAssinaturaInterna.onCompleteAll = function() {
-    uploaderLogoTarjaAssinaturaInterna.clearQueue();
-    $scope.getTarjaAssinatura($scope.tarjaAssinatura);
+  $scope.uploaderLogoTarjaAssinaturaInterna.onCompleteAll = function() {
+    $scope.uploaderLogoTarjaAssinaturaInterna.clearQueue();
+    $scope.getAllTarjas()
     console.info('onCompleteAll');
   };
 
 //INSTANCIA DO OBJETO PARA FAZER UPLOAD
-  var uploaderLogoTarjaAssinaturaCertificado = $scope.uploaderLogoTarjaAssinaturaCertificado = new FileUploader({
+  $scope.uploaderLogoTarjaAssinaturaCertificado = new FileUploader({
     autoUpload: false,
     queueLimit: 1,
-    url : '/cit-ecm-web/rest/tarjaAssinatura/uploadFileLogo?idOrganizacao=' + $scope.usuarioLogado.organizacao.id +
-    '&idTarjaAssinatura=' + $scope.tarjaAssinatura.assinaturaCertificado.id
+    url :'/cit-ecm-web/rest/tarjaAssinatura/uploadFileLogo?idOrganizacao=' + $scope.usuarioLogado.organizacao.id + '&idTarjaAssinatura='
   });
 
   // FILTERS
-  uploaderLogoTarjaAssinaturaCertificado.filters.push({
+  $scope.uploaderLogoTarjaAssinaturaCertificado.filters.push({
     name: 'imageFilter',
     fn: function(item , options) {
       var type = '|' + item.type.slice(item.type.lastIndexOf('/') + 1) + '|';
@@ -156,41 +162,40 @@ citApp.controller('TarjaAssinaturaController',
   });
 
   // CALLBACKS
-  uploaderLogoTarjaAssinaturaCertificado.onWhenAddingFileFailed = function(item , filter, options) {
-    uploaderLogoTarjaAssinaturaCertificado.clearQueue();
+  $scope.uploaderLogoTarjaAssinaturaCertificado.onWhenAddingFileFailed = function(item , filter, options) {
+	$scope.uploaderLogoTarjaAssinaturaCertificado.clearQueue();
     console.info('onWhenAddingFileFailed', item, filter, options);
   };
-  uploaderLogoTarjaAssinaturaCertificado.onAfterAddingFile = function(fileItem) {
+  $scope.uploaderLogoTarjaAssinaturaCertificado.onAfterAddingFile = function(fileItem) {
     console.info('onAfterAddingFile', fileItem);
   };
-  uploaderLogoTarjaAssinaturaCertificado.onAfterAddingAll = function(addedFileItems) {
+  $scope.uploaderLogoTarjaAssinaturaCertificado.onAfterAddingAll = function(addedFileItems) {
     console.info('onAfterAddingAll', addedFileItems);
   };
-  uploaderLogoTarjaAssinaturaCertificado.onBeforeUploadItem = function(item) {
+  $scope.uploaderLogoTarjaAssinaturaCertificado.onBeforeUploadItem = function(item) {
     console.info('onBeforeUploadItem', item);
   };
-  uploaderLogoTarjaAssinaturaCertificado.onProgressItem = function(fileItem, progress) {
+  $scope.uploaderLogoTarjaAssinaturaCertificado.onProgressItem = function(fileItem, progress) {
     console.info('onProgressItem', fileItem, progress);
   };
-  uploaderLogoTarjaAssinaturaCertificado.onProgressAll = function(progress) {
+  $scope.uploaderLogoTarjaAssinaturaCertificado.onProgressAll = function(progress) {
     console.info('onProgressAll', progress);
   };
-  uploaderLogoTarjaAssinaturaCertificado.onSuccessItem = function(fileItem, response, status, headers) {
+  $scope.uploaderLogoTarjaAssinaturaCertificado.onSuccessItem = function(fileItem, response, status, headers) {
     console.info('onSuccessItem', fileItem, response, status, headers);
   };
-  uploaderLogoTarjaAssinaturaCertificado.onErrorItem = function(fileItem, response, status, headers) {
+  $scope.uploaderLogoTarjaAssinaturaCertificado.onErrorItem = function(fileItem, response, status, headers) {
     console.info('onErrorItem', fileItem, response, status, headers);
   };
-  uploaderLogoTarjaAssinaturaCertificado.onCancelItem = function(fileItem, response, status, headers) {
+  $scope.uploaderLogoTarjaAssinaturaCertificado.onCancelItem = function(fileItem, response, status, headers) {
     console.info('onCancelItem', fileItem, response, status, headers);
   };
-  uploaderLogoTarjaAssinaturaCertificado.onCompleteItem = function(fileItem, response, status, headers) {
+  $scope.uploaderLogoTarjaAssinaturaCertificado.onCompleteItem = function(fileItem, response, status, headers) {
     console.info('onCompleteItem', fileItem, response, status, headers);
   };
-  uploaderLogoTarjaAssinaturaCertificado.onCompleteAll = function() {
-    uploaderLogoTarjaAssinaturaCertificado.clearQueue();
-    $scope.getTarjaAssinatura($scope.tarjaAssinatura);
+  $scope.uploaderLogoTarjaAssinaturaCertificado.onCompleteAll = function() {
+	$scope.uploaderLogoTarjaAssinaturaCertificado.clearQueue();
+    $scope.getAllTarjas();
     console.info('onCompleteAll');
   };
-
 }]);
diff --git a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/TarjaAssinaturaRepository.js b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/TarjaAssinaturaRepository.js
index 00622d7..8fc12cd 100644
--- a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/TarjaAssinaturaRepository.js
+++ b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/TarjaAssinaturaRepository.js
@@ -8,6 +8,10 @@ citApp.factory('TarjaAssinaturaRepository', ['RestangularEcm', 'AbstractReposito
 		this.getAllTarjas = function() {
 			return restangularEcm.one(this.route + "/getAllTarjas" ).get();
 		};
+
+		this.save = function(tarjaAssinatura) {
+			return restangularEcm.all(this.route + "/saveTarjaAssinatura").post(tarjaAssinatura).then();
+		};
     }
 
     AbstractRepository.extend(TarjaAssinaturaRepository);
diff --git a/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaEdit.html b/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaEdit.html
index c124241..e3f69c4 100644
--- a/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaEdit.html
+++ b/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaEdit.html
@@ -2,7 +2,7 @@
 	<div class="bar-buttons-action fixed">
 		<div class="row">
 			<div class="col-sm-8 text-left">
-				<button class="btn btn-clear" ng-click="saveOrUpdate(tarjaAssinaturaInternaForm, tarjaAssinaturaCertificadoForm)" ng-show="edit">
+				<button class="btn btn-clear" ng-click="saveOrUpdate()" ng-show="edit">
 					<i class="fa fa-save green"></i>
 					<translate>LABEL.SALVAR</translate>
 				</button>
@@ -28,15 +28,12 @@
 		</div><!-- .row -->
 	</div><!-- .bar-buttons-action -->
 
-<!-- 	<h1 class="title"><translate>ECM.LABEL.TARJAS_ASSINATURA</translate></h1> -->
-<!-- 	</br> -->
 	<breadcrumb ng-workspace="workspace"></breadcrumb>
-
+	<form name="tarjaAssinaturaForm">
 	<tabset class="tabbable margin-top margin-bottom">
-		<tab>
+		<tab active="activateTab()">
 			<tab-heading><translate>ECM.LABEL.ASSINATURA_INTERNA</translate></tab-heading>
-
-			<form name="tarjaAssinaturaInternaForm">
+<!-- 			<form name="tarjaAssinaturaInternaForm"> -->
 				<p><small>( <span class="red">*</span> ) <translate>LABEL.CAMPOS_OBRIGATORIOS</translate></small></p>
 				<fieldset>
 					<legend>
@@ -46,56 +43,54 @@
 				<div class="row">
 					<div class="col-md-6">
 						<label-input ng-id="tarjaAssinatura.assinaturaInterna.descricao" ng-label="LABEL.DESCRICAO" ng-type="text"
-							ng-model="tarjaAssinatura.assinaturaInterna.descricao" form="tarjaAssinaturaInternaForm" ng-obrigatorio="true"
+							ng-model="tarjaAssinatura.assinaturaInterna.descricao" form="tarjaAssinaturaForm" ng-obrigatorio="true"
 							ng-custom-maxlength="100" ng-type="text" ng-disabled="!edit" />
 					</div>
 					<div class="col-md-4">
 						<label-input ng-id="tarjaAssinatura.assinaturaInterna.tipoAssinatura" ng-label="ECM.LABEL.TIPO_ASSINATURA" ng-type="text"
-									ng-disabled="true" ng-model="tarjaAssinatura.assinaturaInterna.tipoAssinatura.descricao" form="tarjaAssinaturaInternaForm"
+									ng-disabled="true" ng-model="tarjaAssinatura.assinaturaInterna.tipoAssinatura.descricao" form="tarjaAssinaturaForm"
 									ng-obrigatorio="false" ng-type="text" />
 					</div>
 				</div>
 				<div class="row">
 					<div class="col-sm-12">
-						<div class="form-group">
+						<div class="form-group" ng-disable="!edit">
 							<label class="control-label"><translate>ECM.LABEL.LOGO_TARJA_ASSINATURA</translate></label>
-							<div nv-file-drop="" uploader="uploaderLogoTarjaAssinaturaInterna" onclick="$('#uploadLogoTarjaAssinaturaInterna').click();">
+							<div ng-if="tarjaAssinatura.assinaturaInterna.anexoImagem.anexo == undefined" nv-file-drop="" uploader="uploaderLogoTarjaAssinaturaInterna"
+								onclick="this.edit ? $('#uploadLogoTarjaAssinaturaInterna').click() : null">
 								<div nv-file-over="" uploader="uploaderLogoTarjaAssinaturaInterna" over-class="another-file-over-class" class="well my-drop-zone">
 									<span ng-show="uploaderLogoTarjaAssinaturaInterna.queue.length <= 0"><translate>MSG.ARRASTE_SOLTE_ARQUIVO</translate></span>
 									<span ng-show="uploaderLogoTarjaAssinaturaInterna.queue.length > 0">{{uploaderLogoTarjaAssinaturaInterna.queue[0].file.name}}</span>
 								</div>
 							</div>
 							<input id="uploadLogoTarjaAssinaturaInterna" type="file" nv-file-select="" uploader="uploaderLogoTarjaAssinaturaInterna" ng-show="false" />
-							<div ng-show="uploaderLogoTarjaAssinaturaInterna.queue.length > 0 && tarjaAssinatura.assinaturaInterna.anexoImagem.anexo == undefined">
-								<div ng-thumb="{ file: uploaderLogoTarjaAssinaturaInterna.queue._file, width: auto, height: auto }"></div>
-							</div>
 						</div><!-- .form-group -->
-						<div ng-show="tarjaAssinatura.assinaturaCertificado.anexoImagem.anexo">
-							<img ng-src="data:image/JPEG;base64,{{tarjaAssinatura.assinaturaInterna.anexoImagem.anexo}}" class="img-thumbnail" style="max-width: 300px; height: auto;">
-						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-sm-12" ng-show="tarjaAssinatura.assinaturaInterna.anexoImagem.anexo">
+						<img ng-src="data:image/JPEG;base64,{{tarjaAssinatura.assinaturaInterna.anexoImagem.anexo}}" class="img-thumbnail" style="max-width: 300px; height: auto;">
 					</div>
 				</div>
 				<div class="row">
 					<div class="col-md-12">
 						<div class="form-group">
-							<label class="control-label block" ng-class="{'has-error': !tarjaAssinatura.assinaturaInterna.conteudo && tarjaAssinaturaInternaForm.$submitted}">
+							<label class="control-label block" ng-class="{'has-error': !tarjaAssinatura.assinaturaInterna.conteudo && tarjaAssinaturaForm.$submitted}">
 								<translate>ECM.LABEL.CONTEUDO_HTML</translate> <span class="red">*</span>
-								<i ng-show="!tarjaAssinatura.assinaturaInterna.conteudo && tarjaAssinaturaInternaForm.$submitted" class='fa fa-warning red'
+								<i ng-show="!tarjaAssinatura.assinaturaInterna.conteudo && tarjaAssinaturaForm.$submitted" class='fa fa-warning red'
 									tooltip="{{$translate.instant('ECM.LABEL.CONTEUDO_HTML') + ' ' +$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}"
 									tooltip-placement='top'></i>
 							</label>
-							<div id="tarjaAssinatura.assinaturaInterna.conteudo" ckeditor="options" ng-if='edit' ready="onReady()"
-								ng-model="tarjaAssinatura.assinaturaInterna.conteudo" ></div>
-							<iframe id="visualizacaoConteudoTarjaAssinatura" allowfullscreen class="iframe-report" ng-show="!edit"></iframe>
+							<div id="tarjaAssinatura.assinaturaInterna.conteudo" ckeditor="options" ng-if='edit' ready="onReady()" ng-model="tarjaAssinatura.assinaturaInterna.conteudo" ></div>
+							<iframe id="visualizacaoConteudoTarjaAssinatura" srcdoc="{{tarjaAssinatura.assinaturaInterna.conteudo}}" allowfullscreen class="iframe-report" ng-show="!edit" style="min-height: 100px !important;"></iframe>
 						</div>
 					</div>
 				</div>
-			</form>
+<!-- 			</form> -->
 		</tab>
+
 		<tab>
 			<tab-heading><translate>ECM.LABEL.ASSINATURA_CERTIFICADO_DIGITAL</translate></tab-heading>
-
-			<form name="tarjaAssinaturaCertificadoForm">
 				<p><small>( <span class="red">*</span> ) <translate>LABEL.CAMPOS_OBRIGATORIOS</translate></small></p>
 				<fieldset>
 					<legend>
@@ -105,12 +100,12 @@
 				<div class="row">
 					<div class="col-md-6">
 						<label-input ng-id="tarjaAssinatura.assinaturaCertificado.descricao" ng-label="LABEL.DESCRICAO" ng-type="text"
-							ng-model="tarjaAssinatura.assinaturaCertificado.descricao" form="tarjaAssinaturaCertificadoForm" ng-obrigatorio="true"
+							ng-model="tarjaAssinatura.assinaturaCertificado.descricao" form="tarjaAssinaturaForm" ng-obrigatorio="true"
 							ng-custom-maxlength="100" ng-type="text" ng-disabled="!edit" />
 					</div>
 					<div class="col-md-4">
 						<label-input ng-id="tarjaAssinatura.assinaturaCertificado.tipoAssinatura" ng-label="ECM.LABEL.TIPO_ASSINATURA" ng-type="text"
-									ng-disabled="true" ng-model="tarjaAssinatura.assinaturaCertificado.tipoAssinatura.descricao" form="tarjaAssinaturaCertificadoForm"
+									ng-disabled="true" ng-model="tarjaAssinatura.assinaturaCertificado.tipoAssinatura.descricao" form="tarjaAssinaturaForm"
 									ng-obrigatorio="false" ng-type="text" />
 					</div>
 				</div>
@@ -118,39 +113,38 @@
 					<div class="col-sm-12">
 						<div class="form-group">
 							<label class="control-label"><translate>ECM.LABEL.LOGO_TARJA_ASSINATURA</translate></label>
-							<div nv-file-drop="" uploader="uploaderLogoTarjaAssinaturaCertificado" onclick="$('#uploadLogoTarjaAssinaturaCertificado').click();">
+							<div ng-if="tarjaAssinatura.assinaturaCertificado.anexoImagem.anexo == undefined" nv-file-drop="" uploader="uploaderLogoTarjaAssinaturaCertificado"
+								onclick="$('#uploadLogoTarjaAssinaturaCertificado').click()">
 								<div nv-file-over="" uploader="uploaderLogoTarjaAssinaturaCertificado" over-class="another-file-over-class" class="well my-drop-zone">
 									<span ng-show="uploaderLogoTarjaAssinaturaCertificado.queue.length <= 0"><translate>MSG.ARRASTE_SOLTE_ARQUIVO</translate></span>
 									<span ng-show="uploaderLogoTarjaAssinaturaCertificado.queue.length > 0">{{uploaderLogoTarjaAssinaturaCertificado.queue[0].file.name}}</span>
 								</div>
 							</div>
 							<input id="uploadLogoTarjaAssinaturaCertificado" type="file" nv-file-select="" uploader="uploaderLogoTarjaAssinaturaCertificado" ng-show="false" />
-							<div ng-show="uploaderLogoTarjaAssinaturaCertificado.queue.length > 0 && tarjaAssinatura.assinaturaCertificado.anexoImagem.anexo == undefined">
-								<div ng-thumb="{ file: uploaderLogoTarjaAssinaturaCertificado.queue._file, width: auto, height: auto }"></div>
-							</div>
 						</div><!-- .form-group -->
-						<div ng-show="tarjaAssinatura.assinaturaCertificado.anexoImagem.anexo">
+					</div>
+					<div class="row">
+						<div class="col-sm-12" ng-show="tarjaAssinatura.assinaturaCertificado.anexoImagem.anexo">
 							<img ng-src="data:image/JPEG;base64,{{tarjaAssinatura.assinaturaCertificado.anexoImagem.anexo}}" class="img-thumbnail" style="max-width: 300px; height: auto;">
 						</div>
 					</div>
 				</div>
+
 				<div class="row">
 					<div class="col-md-12">
 						<div class="form-group">
-							<label class="control-label block" ng-class="{'has-error': !tarjaAssinatura.assinaturaCertificado.conteudo && tarjaAssinaturaCertificadoForm.$submitted}">
+							<label class="control-label block" ng-class="{'has-error': !tarjaAssinatura.assinaturaCertificado.conteudo && tarjaAssinaturaForm.$submitted}">
 								<translate>ECM.LABEL.CONTEUDO_HTML</translate> <span class="red">*</span>
-								<i ng-show="!tarjaAssinatura.assinaturaCertificado.conteudo && tarjaAssinaturaCertificadoForm.$submitted" class='fa fa-warning red'
+								<i ng-show="!tarjaAssinatura.assinaturaCertificado.conteudo && tarjaAssinaturaForm.$submitted" class='fa fa-warning red'
 									tooltip="{{$translate.instant('ECM.LABEL.CONTEUDO_HTML') + ' ' +$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}"
 									tooltip-placement='top'></i>
 							</label>
-							<div id="tarjaAssinatura.assinaturaCertificado.conteudo" ckeditor="options" ng-if='edit' ready="onReady()"
-								ng-model="tarjaAssinatura.assinaturaCertificado.conteudo" ></div>
-							<iframe id="visualizacaoConteudoTarjaAssinatura" allowfullscreen class="iframe-report" ng-show="!edit"></iframe>
+							<div id="tarjaAssinatura.assinaturaCertificado.conteudo" ckeditor="options" ng-if='edit' ready="onReady()" ng-model="tarjaAssinatura.assinaturaCertificado.conteudo" ></div>
+							<iframe id="visualizacaoConteudoTarjaAssinatura" srcdoc="{{tarjaAssinatura.assinaturaCertificado.conteudo}}"allowfullscreen class="iframe-report" ng-show="!edit" style="min-height: 100px !important;"></iframe>
 						</div>
 					</div>
 				</div>
-			</form>
 		</tab>
 	</tabset>
-</div>
-<!-- .page-content -->
+	</form>
+</div><!-- .page-content -->
--
libgit2 0.21.2