Commit 6ba1f4bed2df9f6c358e8851a42b8bd106f5706c
1 parent
0287d629
Exists in
master
[Redmine #4466]
Corrigindo erro ao setar o id da tarja no uploader
Showing
5 changed files
with
54 additions
and
83 deletions
Show diff stats
cit-ecm-api/pom.xml
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | -<!-- ******************************************************************************************************************** --> | ||
3 | -<!-- * LICENCA*GPLv2 * --> | ||
4 | -<!-- * Copyright [2011,2012,2013,2014,2015] da CentralIT Tecnologia da Informação | ||
5 | - Ltda (www.centralit.com.br) * --> | ||
6 | -<!-- * * --> | ||
7 | -<!-- * Este arquivo é parte do programa/software: Citsmart (www.citsmart.com.br) | ||
8 | - * --> | ||
9 | -<!-- * * --> | ||
10 | -<!-- * O Citsmart é um software livre; você pode redistribui-lo e/ou modificá-lo | ||
11 | - dentro dos termos da Licença * --> | ||
12 | -<!-- * Pública Geral GNU como publicada pela Fundação do Software Livre (FSF); | ||
13 | - na versão 2 da Licença. * --> | ||
14 | -<!-- * * --> | ||
15 | -<!-- * Este programa/software é distribuído na esperança que possa ser útil, | ||
16 | - mas SEM NENHUMA GARANTIA; sem uma * --> | ||
17 | -<!-- * garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou APLICAÇÃO EM | ||
18 | - PARTICULAR. Veja a Licença Pública Geral * --> | ||
19 | -<!-- * GNU/GPL em português para maiores detalhes. * --> | ||
20 | -<!-- * * --> | ||
21 | -<!-- * Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob | ||
22 | - o título 'LICENCA.txt', junto com este * --> | ||
23 | -<!-- * programa/software, se não, acesse o Portal do Software Público Brasileiro | ||
24 | - no endereço www.softwarepublico.gov.br * --> | ||
25 | -<!-- * ou escreva para a Fundação do Software Livre (FSF) Inc., 51 Franklin | ||
26 | - St, Fifth Floor, Boston, MA 02110-1301,USA * --> | ||
27 | -<!-- ******************************************************************************************************************** --> | 2 | +<!-- ******************************************************************************************************************** --> |
3 | +<!-- * LICENCA*GPLv2 * --> | ||
4 | +<!-- * Copyright [2011,2012,2013,2014,2015] da CentralIT Tecnologia da Informação Ltda (www.centralit.com.br) * --> | ||
5 | +<!-- * * --> | ||
6 | +<!-- * Este arquivo é parte do programa/software: Citsmart (www.citsmart.com.br) * --> | ||
7 | +<!-- * * --> | ||
8 | +<!-- * O Citsmart é um software livre; você pode redistribui-lo e/ou modificá-lo dentro dos termos da Licença * --> | ||
9 | +<!-- * Pública Geral GNU como publicada pela Fundação do Software Livre (FSF); na versão 2 da Licença. * --> | ||
10 | +<!-- * * --> | ||
11 | +<!-- * Este programa/software é distribuído na esperança que possa ser útil, mas SEM NENHUMA GARANTIA; sem uma * --> | ||
12 | +<!-- * garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral * --> | ||
13 | +<!-- * GNU/GPL em português para maiores detalhes. * --> | ||
14 | +<!-- * * --> | ||
15 | +<!-- * Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título 'LICENCA.txt', junto com este * --> | ||
16 | +<!-- * programa/software, se não, acesse o Portal do Software Público Brasileiro no endereço www.softwarepublico.gov.br * --> | ||
17 | +<!-- * ou escreva para a Fundação do Software Livre (FSF) Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,USA * --> | ||
18 | +<!-- ******************************************************************************************************************** --> | ||
28 | <project | 19 | <project |
29 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" | 20 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" |
30 | xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> | 21 | xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> |
@@ -49,17 +40,17 @@ | @@ -49,17 +40,17 @@ | ||
49 | <dependency> | 40 | <dependency> |
50 | <groupId>br.com.centralit</groupId> | 41 | <groupId>br.com.centralit</groupId> |
51 | <artifactId>cit-core</artifactId> | 42 | <artifactId>cit-core</artifactId> |
52 | - <version>${project.version}</version> | 43 | + <version>${cit-core.version}</version> |
53 | </dependency> | 44 | </dependency> |
54 | <dependency> | 45 | <dependency> |
55 | <groupId>br.com.centralit</groupId> | 46 | <groupId>br.com.centralit</groupId> |
56 | <artifactId>cit-portal-api</artifactId> | 47 | <artifactId>cit-portal-api</artifactId> |
57 | - <version>${project.version}</version> | 48 | + <version>${cit-portal.version}</version> |
58 | </dependency> | 49 | </dependency> |
59 | <dependency> | 50 | <dependency> |
60 | <groupId>br.com.centralit</groupId> | 51 | <groupId>br.com.centralit</groupId> |
61 | <artifactId>cit-tabelas-corp-api</artifactId> | 52 | <artifactId>cit-tabelas-corp-api</artifactId> |
62 | - <version>${project.version}</version> | 53 | + <version>${cit-tabelas-corp.version}</version> |
63 | </dependency> | 54 | </dependency> |
64 | <dependency> | 55 | <dependency> |
65 | <groupId>org.json</groupId> | 56 | <groupId>org.json</groupId> |
@@ -90,6 +81,6 @@ | @@ -90,6 +81,6 @@ | ||
90 | <groupId>com.googlecode.json-simple</groupId> | 81 | <groupId>com.googlecode.json-simple</groupId> |
91 | <artifactId>json-simple</artifactId> | 82 | <artifactId>json-simple</artifactId> |
92 | <version>1.1</version> | 83 | <version>1.1</version> |
93 | - </dependency> | 84 | + </dependency> |
94 | </dependencies> | 85 | </dependencies> |
95 | </project> | 86 | </project> |
cit-ecm-web/pom.xml
@@ -31,22 +31,16 @@ | @@ -31,22 +31,16 @@ | ||
31 | <packaging>war</packaging> | 31 | <packaging>war</packaging> |
32 | <name>cit-ecm-web</name> | 32 | <name>cit-ecm-web</name> |
33 | 33 | ||
34 | - <properties> | ||
35 | - <findbugs.config.path>${project.parent.parent.parent.basedir}/filterfile.xml</findbugs.config.path> | ||
36 | - <license.config.path>${project.parent.parent.basedir}/src/licensing</license.config.path> | ||
37 | - <maven-antrun-plugin.phase>package</maven-antrun-plugin.phase> | ||
38 | - <minify-maven-plugin.phase>prepare-package</minify-maven-plugin.phase> | ||
39 | - </properties> | 34 | + <properties> |
35 | + <findbugs.config.path>${project.parent.parent.parent.basedir}/filterfile.xml</findbugs.config.path> | ||
36 | + <license.config.path>${project.parent.parent.basedir}/src/licensing</license.config.path> | ||
37 | + <maven-antrun-plugin.phase>package</maven-antrun-plugin.phase> | ||
38 | + <minify-maven-plugin.phase>prepare-package</minify-maven-plugin.phase> | ||
39 | + </properties> | ||
40 | 40 | ||
41 | <dependencies> | 41 | <dependencies> |
42 | <dependency> | 42 | <dependency> |
43 | <groupId>br.com.centralit</groupId> | 43 | <groupId>br.com.centralit</groupId> |
44 | - <artifactId>cit-core</artifactId> | ||
45 | - <version>${cit-core.version}</version> | ||
46 | - </dependency> | ||
47 | - | ||
48 | - <dependency> | ||
49 | - <groupId>br.com.centralit</groupId> | ||
50 | <artifactId>cit-ecm-api</artifactId> | 44 | <artifactId>cit-ecm-api</artifactId> |
51 | </dependency> | 45 | </dependency> |
52 | </dependencies> | 46 | </dependencies> |
cit-ecm-web/src/main/resources/spring/applicationContext.xml
1 | <beans xmlns="http://www.springframework.org/schema/beans" | 1 | <beans xmlns="http://www.springframework.org/schema/beans" |
2 | - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" | ||
3 | - xmlns:context="http://www.springframework.org/schema/context" | ||
4 | - xmlns:aop="http://www.springframework.org/schema/aop" xmlns:faces="http://www.springframework.org/schema/faces" | ||
5 | - xmlns:int-security="http://www.springframework.org/schema/integration/security" | ||
6 | - xmlns:sec="http://www.springframework.org/schema/security" xmlns:task="http://www.springframework.org/schema/task" | ||
7 | - xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p" | ||
8 | - xsi:schemaLocation="http://www.springframework.org/schema/beans | ||
9 | - http://www.springframework.org/schema/beans/spring-beans-3.1.xsd | ||
10 | - http://www.springframework.org/schema/faces | ||
11 | - http://www.springframework.org/schema/faces/spring-faces-3.1.xsd | ||
12 | - http://www.springframework.org/schema/tx | ||
13 | - http://www.springframework.org/schema/tx/spring-tx-3.1.xsd | ||
14 | - http://www.springframework.org/schema/context | ||
15 | - http://www.springframework.org/schema/context/spring-context-3.1.xsd | ||
16 | - http://www.springframework.org/schema/aop | ||
17 | - http://www.springframework.org/schema/aop/spring-aop-3.1.xsd | ||
18 | - http://www.springframework.org/schema/task | ||
19 | - http://www.springframework.org/schema/task/spring-task-3.1.xsd | ||
20 | - http://www.springframework.org/schema/security | ||
21 | - http://www.springframework.org/schema/security/spring-security-3.1.xsd | ||
22 | - http://www.springframework.org/schema/util | ||
23 | - http://www.springframework.org/schema/util/spring-util-3.1.xsd | ||
24 | - http://www.springframework.org/schema/integration | ||
25 | - http://www.springframework.org/schema/integration/spring-integration.xsd | ||
26 | - http://www.springframework.org/schema/integration/security | ||
27 | - http://www.springframework.org/schema/integration/security/spring-integration-security-3.1.xsd"> | 2 | + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
3 | + xmlns:context="http://www.springframework.org/schema/context" | ||
4 | + xmlns:util="http://www.springframework.org/schema/util" | ||
5 | + xmlns:p="http://www.springframework.org/schema/p" | ||
6 | + xsi:schemaLocation="http://www.springframework.org/schema/beans | ||
7 | + http://www.springframework.org/schema/beans/spring-beans-3.1.xsd | ||
8 | + http://www.springframework.org/schema/context | ||
9 | + http://www.springframework.org/schema/context/spring-context-3.1.xsd | ||
10 | + http://www.springframework.org/schema/util | ||
11 | + http://www.springframework.org/schema/util/spring-util-3.1.xsd"> | ||
28 | 12 | ||
29 | <bean id="citPortalDataSource" class="org.springframework.jndi.JndiObjectFactoryBean"> | 13 | <bean id="citPortalDataSource" class="org.springframework.jndi.JndiObjectFactoryBean"> |
30 | <property name="jndiName" value="java:/env/jdbc/cit-ecm" /> | 14 | <property name="jndiName" value="java:/env/jdbc/cit-ecm" /> |
31 | </bean> | 15 | </bean> |
32 | 16 | ||
33 | <bean id="entityManagerFactory" | 17 | <bean id="entityManagerFactory" |
34 | - class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" | ||
35 | - p:packagesToScan="br.com.centralit.framework.model, br.com.centralit.api.model" p:dataSource-ref="citPortalDataSource" | ||
36 | - p:jpaPropertyMap-ref="jpaPropertyMap" p:jpaVendorAdapter-ref="jpaVendorAdapter" /> | 18 | + class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" |
19 | + p:packagesToScan="br.com.centralit.framework.model, br.com.centralit.api.model" | ||
20 | + p:dataSource-ref="citPortalDataSource" p:jpaPropertyMap-ref="jpaPropertyMap" | ||
21 | + p:jpaVendorAdapter-ref="jpaVendorAdapter" /> | ||
37 | 22 | ||
38 | <bean id="jpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" /> | 23 | <bean id="jpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" /> |
39 | - | ||
40 | - <bean id="webExpressionHandler" class="br.com.centralit.api.security.CustomExpressionHandler"/> | ||
41 | - | 24 | + |
25 | + <bean id="webExpressionHandler" class="br.com.centralit.api.security.CustomExpressionHandler" /> | ||
26 | + | ||
42 | <util:map id="jpaPropertyMap"> | 27 | <util:map id="jpaPropertyMap"> |
43 | <entry key="generateDdl" value="${hibernate.generate.ddl}" /> | 28 | <entry key="generateDdl" value="${hibernate.generate.ddl}" /> |
44 | <entry key="hibernate.hbm2ddl.auto" value="${hibernate.hbm2ddl.auto}" /> | 29 | <entry key="hibernate.hbm2ddl.auto" value="${hibernate.hbm2ddl.auto}" /> |
cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaController.js
@@ -44,24 +44,23 @@ citApp.controller('TarjaAssinaturaController', | @@ -44,24 +44,23 @@ citApp.controller('TarjaAssinaturaController', | ||
44 | $scope.tipoAssinaturaCertificado = result.originalElement; | 44 | $scope.tipoAssinaturaCertificado = result.originalElement; |
45 | }); | 45 | }); |
46 | 46 | ||
47 | - var vincularIdTarjaUploader = function () { | ||
48 | - if($scope.tarjaAssinatura.assinaturaInterna.id && $scope.tarjaAssinatura.assinaturaCertificado.id){ | ||
49 | - $scope.uploaderLogoTarjaAssinaturaInterna.url += $scope.tarjaAssinatura.assinaturaInterna.id; | ||
50 | - $scope.uploaderLogoTarjaAssinaturaCertificado.url += $scope.tarjaAssinatura.assinaturaCertificado.id; | ||
51 | - } | ||
52 | - }; | ||
53 | - | ||
54 | $scope.getAllTarjas = function(){ | 47 | $scope.getAllTarjas = function(){ |
55 | $scope.setLoadingGet(true); | 48 | $scope.setLoadingGet(true); |
56 | TarjaAssinaturaRepository.getAllTarjas().then(function(result) { | 49 | TarjaAssinaturaRepository.getAllTarjas().then(function(result) { |
57 | $scope.tarjaAssinatura = result.originalElement; | 50 | $scope.tarjaAssinatura = result.originalElement; |
58 | - vincularIdTarjaUploader(); | ||
59 | $scope.edit = false; | 51 | $scope.edit = false; |
60 | $scope.setLoading(false); | 52 | $scope.setLoading(false); |
61 | }); | 53 | }); |
62 | }; | 54 | }; |
63 | $scope.getAllTarjas(); | 55 | $scope.getAllTarjas(); |
64 | 56 | ||
57 | + var vincularIdTarjaUploader = function () { | ||
58 | + if($scope.tarjaAssinatura.assinaturaInterna.id && $scope.tarjaAssinatura.assinaturaCertificado.id){ | ||
59 | + $scope.uploaderLogoTarjaAssinaturaInterna.url += $scope.tarjaAssinatura.assinaturaInterna.id; | ||
60 | + $scope.uploaderLogoTarjaAssinaturaCertificado.url += $scope.tarjaAssinatura.assinaturaCertificado.id; | ||
61 | + } | ||
62 | + }; | ||
63 | + | ||
65 | $scope.saveOrUpdate = function(){ | 64 | $scope.saveOrUpdate = function(){ |
66 | 65 | ||
67 | $scope.tarjaAssinaturaForm.$submitted = true; | 66 | $scope.tarjaAssinaturaForm.$submitted = true; |
@@ -198,4 +197,6 @@ citApp.controller('TarjaAssinaturaController', | @@ -198,4 +197,6 @@ citApp.controller('TarjaAssinaturaController', | ||
198 | $scope.getAllTarjas(); | 197 | $scope.getAllTarjas(); |
199 | console.info('onCompleteAll'); | 198 | console.info('onCompleteAll'); |
200 | }; | 199 | }; |
200 | + | ||
201 | + vincularIdTarjaUploader(); | ||
201 | }]); | 202 | }]); |
cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaEdit.html
@@ -31,7 +31,7 @@ | @@ -31,7 +31,7 @@ | ||
31 | <breadcrumb ng-workspace="workspace"></breadcrumb> | 31 | <breadcrumb ng-workspace="workspace"></breadcrumb> |
32 | <form name="tarjaAssinaturaForm"> | 32 | <form name="tarjaAssinaturaForm"> |
33 | <tabset class="tabbable margin-top margin-bottom"> | 33 | <tabset class="tabbable margin-top margin-bottom"> |
34 | - <tab active="activateTab()"> | 34 | + <tab> |
35 | <tab-heading><translate>ECM.LABEL.ASSINATURA_INTERNA</translate></tab-heading> | 35 | <tab-heading><translate>ECM.LABEL.ASSINATURA_INTERNA</translate></tab-heading> |
36 | <!-- <form name="tarjaAssinaturaInternaForm"> --> | 36 | <!-- <form name="tarjaAssinaturaInternaForm"> --> |
37 | <p><small>( <span class="red">*</span> ) <translate>LABEL.CAMPOS_OBRIGATORIOS</translate></small></p> | 37 | <p><small>( <span class="red">*</span> ) <translate>LABEL.CAMPOS_OBRIGATORIOS</translate></small></p> |