This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 1a990115f5bce8d6459706a031a757849ed6ec51 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 14 15:21:00 2017 +0100 refs #9106 migration des actions inactives de la conf générale à l'arborescence --- .../src/main/xmi/faxtomail.properties | 4 ++-- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 33882 -> 35274 bytes ...3_170314__move_invalidformactions_to_folders.sql | 10 ++++++++++ ...3_170314__move_invalidformactions_to_folders.sql | 10 ++++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/faxtomail-persistence/src/main/xmi/faxtomail.properties b/faxtomail-persistence/src/main/xmi/faxtomail.properties index 583da0f..1927ed9 100644 --- a/faxtomail-persistence/src/main/xmi/faxtomail.properties +++ b/faxtomail-persistence/src/main/xmi/faxtomail.properties @@ -58,9 +58,8 @@ com.franciaflex.faxtomail.persistence.entities.EmailAccount.attribute.host.tagva com.franciaflex.faxtomail.persistence.entities.EmailAccount.attribute.login.tagvalue.naturalId=true -#�Configuration +# Configuration com.franciaflex.faxtomail.persistence.entities.Configuration.attribute.searchDisplayColumns.tagvalue.hibernateAttributeType=com.franciaflex.faxtomail.persistence.hibernate.MailFieldEnumListUserType -com.franciaflex.faxtomail.persistence.entities.Configuration.attribute.invalidFormDisabledActions.tagvalue.hibernateAttributeType=com.franciaflex.faxtomail.persistence.hibernate.MailActionEnumSetUserType # ExtensionCommand com.franciaflex.faxtomail.persistence.entities.ExtensionCommand.attribute.extension.tagvalue.naturalId=true @@ -83,6 +82,7 @@ com.franciaflex.faxtomail.persistence.entities.MailFolder.attribute.parent.tagva com.franciaflex.faxtomail.persistence.entities.MailFolder.attribute.parent.tagvalue.notNull=false com.franciaflex.faxtomail.persistence.entities.MailFolder.attribute.name.tagvalue.naturalId=true com.franciaflex.faxtomail.persistence.entities.MailFolder.attribute.folderTableColumns.tagvalue.hibernateAttributeType=com.franciaflex.faxtomail.persistence.hibernate.MailFieldEnumListUserType +com.franciaflex.faxtomail.persistence.entities.MailFolder.attribute.invalidFormDisabledActions.tagvalue.hibernateAttributeType=com.franciaflex.faxtomail.persistence.hibernate.MailActionEnumSetUserType # MailFilter com.franciaflex.faxtomail.persistence.entities.MailFilter.attribute.expression.tagvalue.naturalId=true diff --git a/faxtomail-persistence/src/main/xmi/faxtomail.zargo b/faxtomail-persistence/src/main/xmi/faxtomail.zargo index 1d9a086..646af6c 100644 Binary files a/faxtomail-persistence/src/main/xmi/faxtomail.zargo and b/faxtomail-persistence/src/main/xmi/faxtomail.zargo differ diff --git a/faxtomail-service/src/main/resources/db/migration/h2/V2_2_3_170314__move_invalidformactions_to_folders.sql b/faxtomail-service/src/main/resources/db/migration/h2/V2_2_3_170314__move_invalidformactions_to_folders.sql new file mode 100644 index 0000000..a6f1f7d --- /dev/null +++ b/faxtomail-service/src/main/resources/db/migration/h2/V2_2_3_170314__move_invalidformactions_to_folders.sql @@ -0,0 +1,10 @@ +alter table mailfolder add useCurrentLevelInvalidFormDisabledActions boolean; +alter table mailfolder add invalidFormDisabledActions varchar(MAX); + +update mailfolder set useCurrentLevelInvalidFormDisabledActions = 'f'; +update mailfolder +set useCurrentLevelInvalidFormDisabledActions = 't', + invalidFormDisabledActions = (select invalidFormDisabledActions from configuration) +where parent is null; + +alter table configuration drop invalidFormDisabledActions; \ No newline at end of file diff --git a/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_2_3_170314__move_invalidformactions_to_folders.sql b/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_2_3_170314__move_invalidformactions_to_folders.sql new file mode 100644 index 0000000..9d9555a --- /dev/null +++ b/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_2_3_170314__move_invalidformactions_to_folders.sql @@ -0,0 +1,10 @@ +alter table mailfolder add useCurrentLevelInvalidFormDisabledActions bit; +alter table mailfolder add invalidFormDisabledActions varchar(MAX); + +update mailfolder set useCurrentLevelInvalidFormDisabledActions = 0; +update mailfolder +set useCurrentLevelInvalidFormDisabledActions = 1, + invalidFormDisabledActions = (select invalidFormDisabledActions from configuration) +where parent is null; + +alter table configuration drop invalidFormDisabledActions; \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.