branch feature/7060 updated (8730ee6 -> 67d677b)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7060 in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 8730ee6 - fin de l'interface d'admin des marques par nom de domaine - ajout d'un bouton pour choisir parmi les clients détectés lors de la réception new 67d677b fix migration scripts The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 67d677b38c60acd24d62126292c9fe8ea16bf264 Author: Kevin Morin <morin@codelutin.com> Date: Wed May 6 11:47:55 2015 +0200 fix migration scripts Summary of changes: .../persistence/entities/BrandsForDomainImpl.java | 24 ++++++++++++++++++++++ .../src/main/resources/faxToMail.properties | 2 +- .../src/main/xmi/faxtomail.properties | 10 +++------ .../faxtomail/services/DecoratorServiceImpl.java | 2 +- .../services/service/InitFaxToMailServiceImpl.java | 2 +- ...s_for_domain_and_matching_clients_in_emails.sql | 4 ++-- ...s_for_domain_and_matching_clients_in_emails.sql | 4 ++-- .../src/main/webapp/js/configuration.js | 2 +- 8 files changed, 35 insertions(+), 15 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7060 in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 67d677b38c60acd24d62126292c9fe8ea16bf264 Author: Kevin Morin <morin@codelutin.com> Date: Wed May 6 11:47:55 2015 +0200 fix migration scripts --- .../persistence/entities/BrandsForDomainImpl.java | 24 ++++++++++++++++++++++ .../src/main/resources/faxToMail.properties | 2 +- .../src/main/xmi/faxtomail.properties | 10 +++------ .../faxtomail/services/DecoratorServiceImpl.java | 2 +- .../services/service/InitFaxToMailServiceImpl.java | 2 +- ...s_for_domain_and_matching_clients_in_emails.sql | 4 ++-- ...s_for_domain_and_matching_clients_in_emails.sql | 4 ++-- .../src/main/webapp/js/configuration.js | 2 +- 8 files changed, 35 insertions(+), 15 deletions(-) diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/BrandsForDomainImpl.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/BrandsForDomainImpl.java index 03d42b6..6d8eec9 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/BrandsForDomainImpl.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/BrandsForDomainImpl.java @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.persistence.entities; +/* + * #%L + * FaxToMail :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2015 Mac-Groupe, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; diff --git a/faxtomail-persistence/src/main/resources/faxToMail.properties b/faxtomail-persistence/src/main/resources/faxToMail.properties index 8c53b23..30dae76 100644 --- a/faxtomail-persistence/src/main/resources/faxToMail.properties +++ b/faxtomail-persistence/src/main/resources/faxToMail.properties @@ -31,7 +31,7 @@ hibernate.connection.password= #hibernate.dialect=org.hibernate.dialect.SQLServer2008Dialect #hibernate.connection.driver_class=net.sourceforge.jtds.jdbc.Driver -#hibernate.connection.url=jdbc:jtds:sqlserver://192.168.100.176:1433/faxtomail +#hibernate.connection.url=jdbc:jtds:sqlserver://192.168.100.247:1433/faxtomailtest #hibernate.connection.username=fx #hibernate.connection.password=FX2013! diff --git a/faxtomail-persistence/src/main/xmi/faxtomail.properties b/faxtomail-persistence/src/main/xmi/faxtomail.properties index e3aa8ae..f101632 100644 --- a/faxtomail-persistence/src/main/xmi/faxtomail.properties +++ b/faxtomail-persistence/src/main/xmi/faxtomail.properties @@ -87,8 +87,7 @@ com.franciaflex.faxtomail.persistence.entities.MailFolder.attribute.folderTableC # MailFilter com.franciaflex.faxtomail.persistence.entities.MailFilter.attribute.expression.tagvalue.naturalId=true com.franciaflex.faxtomail.persistence.entities.MailFilter.attribute.mailFolder.tagvalue.notNull=true -#�TODO echatellier 20141003 : wrong property, fix it with stereotype=unique -com.franciaflex.faxtomail.persistence.entities.MailFilter.attribute.position.tagvalue.unique=true +com.franciaflex.faxtomail.persistence.entities.MailFilter.attribute.position.stereotype=unique # Email com.franciaflex.faxtomail.persistence.entities.Email.attribute.mailFolder.tagvalue.notNull=true @@ -116,7 +115,6 @@ com.franciaflex.faxtomail.persistence.entities.EmailGroup.attribute.email.stereo # History com.franciaflex.faxtomail.persistence.entities.History.attribute.type.tagvalue.notNull=true -com.franciaflex.faxtomail.persistence.entities.History.attribute.fields.stereotype=unique # FaxToMailUser com.franciaflex.faxtomail.persistence.entities.FaxToMailUser.attribute.login.tagvalue.naturalId=true @@ -130,9 +128,7 @@ com.franciaflex.faxtomail.persistence.entities.GroupChef.attribute.userGroup.tag # MailLock com.franciaflex.faxtomail.persistence.entities.MailLock.attribute.lockBy.tagvalue.notNull=true com.franciaflex.faxtomail.persistence.entities.MailLock.attribute.lockOn.tagvalue.notNull=true -#�TODO echatellier 20141003 : wrong property, fix it with stereotype=unique -com.franciaflex.faxtomail.persistence.entities.MailLock.attribute.lockOn.tagvalue.unique=true +com.franciaflex.faxtomail.persistence.entities.MailLock.attribute.lockOn.stereotype=unique # BrandsForDomain -com.franciaflex.faxtomail.persistence.entities.BrandsForDomain.attribute.domain.tagvalue.notNull=true -com.franciaflex.faxtomail.persistence.entities.BrandsForDomain.attribute.domain.stereotype=unique \ No newline at end of file +com.franciaflex.faxtomail.persistence.entities.BrandsForDomain.attribute.domainName.tagvalue.notNull=true \ No newline at end of file diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java index 7492b13..18c6ceb 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java @@ -139,7 +139,7 @@ public class DecoratorServiceImpl extends FaxToMailServiceSupport implements Dec }); registerMultiJXPathDecorator(Reply.class, "${sentDate}$s#${subject}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(FaxToMailUser.class, "${lastName}$s#${firstName}$s#${trigraph}$s", SEPARATOR, " "); - registerMultiJXPathDecorator(Client.class, "${code}$s#${name}$s#${company}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(Client.class, "${code}$s#${name}$s#${brand}$s", SEPARATOR, " - "); } }; } diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java index cab3a51..540f52d 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java @@ -442,7 +442,7 @@ public class InitFaxToMailServiceImpl extends FaxToMailServiceSupport implements Email.PROPERTY_MAIL_FOLDER, folder, Email.PROPERTY_DEMAND_STATUS, opened ? DemandStatus.IN_PROGRESS : DemandStatus.UNTREATED, Email.PROPERTY_HISTORY, Lists.newArrayList(history), - Email.PROPERTY_ORIGINAL_EMAIL, "Demo data"); + Email.PROPERTY_ORIGINAL_EMAIL, originalEmailDao.create(OriginalEmail.PROPERTY_CONTENT, "Demo data")); if (opened) { diff --git a/faxtomail-service/src/main/resources/db/migration/h2/V1_2_0_761__add_brands_for_domain_and_matching_clients_in_emails.sql b/faxtomail-service/src/main/resources/db/migration/h2/V1_2_0_761__add_brands_for_domain_and_matching_clients_in_emails.sql index 47155d7..7cda815 100644 --- a/faxtomail-service/src/main/resources/db/migration/h2/V1_2_0_761__add_brands_for_domain_and_matching_clients_in_emails.sql +++ b/faxtomail-service/src/main/resources/db/migration/h2/V1_2_0_761__add_brands_for_domain_and_matching_clients_in_emails.sql @@ -1,10 +1,10 @@ -- add brands for domain -CREATE TABLE BrandsForDomain ( +CREATE TABLE brandsForDomain ( topiaId VARCHAR(255) NOT NULL, topiaVersion BIGINT NOT NULL, topiaCreateDate TIMESTAMP, - domainName longvarchar NOT NULL UNIQUE, + domainName longvarchar NOT NULL, brandsJson longvarchar, PRIMARY KEY (topiaId) ); diff --git a/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_2_0_761__add_brands_for_domain_and_matching_clients_in_emails.sql b/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_2_0_761__add_brands_for_domain_and_matching_clients_in_emails.sql index 6efe734..d3028f0 100644 --- a/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_2_0_761__add_brands_for_domain_and_matching_clients_in_emails.sql +++ b/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_2_0_761__add_brands_for_domain_and_matching_clients_in_emails.sql @@ -1,10 +1,10 @@ -- add brands for domain -CREATE TABLE BrandsForDomain ( +CREATE TABLE brandsForDomain ( topiaId VARCHAR(255) NOT NULL, topiaVersion BIGINT NOT NULL, topiaCreateDate datetime2, - domainName VARCHAR(MAX) NOT NULL UNIQUE, + domainName VARCHAR(255) NOT NULL, brandsJson VARCHAR(MAX), PRIMARY KEY (topiaId) ); diff --git a/faxtomail-ui-web/src/main/webapp/js/configuration.js b/faxtomail-ui-web/src/main/webapp/js/configuration.js index 5b5dc75..a51a010 100644 --- a/faxtomail-ui-web/src/main/webapp/js/configuration.js +++ b/faxtomail-ui-web/src/main/webapp/js/configuration.js @@ -1232,7 +1232,7 @@ ConfigurationModule.controller('ConfigurationBrandsForDomainController', ['$scop $scope.addBrandsForDomain = function() { if ($scope.brandsForDomains.indexOfBy('domainName', $scope.newBrandsForDomain) != -1) { $window.alert("Ce nom de domaine est déjà configuré !"); - + } else { var newBrandsForDomain = $scope.newBrandsForDomain; newBrandsForDomain.brandsJson = newBrandsForDomain.brands.toString(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm