diff --git a/cit-ecm-api/pom.xml b/cit-ecm-api/pom.xml index 8f9a5b0..0f777ca 100644 --- a/cit-ecm-api/pom.xml +++ b/cit-ecm-api/pom.xml @@ -1,30 +1,21 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -49,17 +40,17 @@ br.com.centralit cit-core - ${project.version} + ${cit-core.version} br.com.centralit cit-portal-api - ${project.version} + ${cit-portal.version} br.com.centralit cit-tabelas-corp-api - ${project.version} + ${cit-tabelas-corp.version} org.json @@ -90,6 +81,6 @@ com.googlecode.json-simple json-simple 1.1 - + diff --git a/cit-ecm-web/pom.xml b/cit-ecm-web/pom.xml index d5a87be..c929642 100644 --- a/cit-ecm-web/pom.xml +++ b/cit-ecm-web/pom.xml @@ -31,22 +31,16 @@ war cit-ecm-web - - ${project.parent.parent.parent.basedir}/filterfile.xml - ${project.parent.parent.basedir}/src/licensing - package - prepare-package - + + ${project.parent.parent.parent.basedir}/filterfile.xml + ${project.parent.parent.basedir}/src/licensing + package + prepare-package + br.com.centralit - cit-core - ${cit-core.version} - - - - br.com.centralit cit-ecm-api diff --git a/cit-ecm-web/src/main/resources/spring/applicationContext.xml b/cit-ecm-web/src/main/resources/spring/applicationContext.xml index 430498d..d75fe91 100644 --- a/cit-ecm-web/src/main/resources/spring/applicationContext.xml +++ b/cit-ecm-web/src/main/resources/spring/applicationContext.xml @@ -1,44 +1,29 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:context="http://www.springframework.org/schema/context" + xmlns:util="http://www.springframework.org/schema/util" + xmlns:p="http://www.springframework.org/schema/p" + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-3.1.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-3.1.xsd + http://www.springframework.org/schema/util + http://www.springframework.org/schema/util/spring-util-3.1.xsd"> + class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" + p:packagesToScan="br.com.centralit.framework.model, br.com.centralit.api.model" + p:dataSource-ref="citPortalDataSource" p:jpaPropertyMap-ref="jpaPropertyMap" + p:jpaVendorAdapter-ref="jpaVendorAdapter" /> - - - + + + 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 d2cd232..c309912 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 @@ -44,24 +44,23 @@ 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; - vincularIdTarjaUploader(); $scope.edit = false; $scope.setLoading(false); }); }; $scope.getAllTarjas(); + 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.saveOrUpdate = function(){ $scope.tarjaAssinaturaForm.$submitted = true; @@ -198,4 +197,6 @@ citApp.controller('TarjaAssinaturaController', $scope.getAllTarjas(); console.info('onCompleteAll'); }; + + vincularIdTarjaUploader(); }]); 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 e3f69c4..678f874 100644 --- a/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaEdit.html +++ b/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaEdit.html @@ -31,7 +31,7 @@
- + ECM.LABEL.ASSINATURA_INTERNA

( * ) LABEL.CAMPOS_OBRIGATORIOS

-- libgit2 0.21.2