From 5a68001ee6a2d00bb4fe64559ade5302a531135a Mon Sep 17 00:00:00 2001 From: Ion Agorria Date: Sat, 18 Jun 2016 03:28:18 +0200 Subject: [PATCH 1/5] Add getElementProperties entry for proposal line --- htdocs/core/lib/functions2.lib.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index 15c1fb498ee..91fdcb8246c 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -1971,6 +1971,11 @@ function getElementProperties($element_type) $module='resource'; $subelement='dolresource'; } + if ($element_type == 'propaldet') { + $classpath = 'comm/propal/class'; + $module='propal'; + $subelement='propaleligne'; + } $classfile = strtolower($subelement); $classname = ucfirst($subelement); From 09306ba974c4ff9c6117a97cff8db1e3dc2ca83a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 15 Jul 2016 10:23:36 +0200 Subject: [PATCH 2/5] Drop not used table llx_document_generator (list of generators must be managed by submodules like are the templates of document or engines to select emailing targets (scan of a dedicated dir) --- htdocs/install/mysql/migration/4.0.0-5.0.0.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql index 849a71c935f..be9a6bc81ec 100644 --- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql +++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql @@ -24,6 +24,7 @@ ALTER TABLE llx_website ADD COLUMN virtualhost varchar(255) after fk_default_home; +DROP TABLE llx_document_generator; From 7e9dbb4d2afd051b2f7fdd752dbd11bca225206e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 15 Jul 2016 10:23:53 +0200 Subject: [PATCH 3/5] Fix bad encoding of param --- htdocs/websites/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/websites/index.php b/htdocs/websites/index.php index 475fe219826..188a3fa7ce6 100644 --- a/htdocs/websites/index.php +++ b/htdocs/websites/index.php @@ -519,7 +519,7 @@ if (count($object->records) > 0) element: \'websites\', table_element: \'website\', fk_element: '.$object->id.', - value: encodeURIComponent(newurl), + value: newurl, }, context: document.body }); From eb47ec58232eaa1d08e6be830f1e619451493f03 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 15 Jul 2016 10:27:20 +0200 Subject: [PATCH 4/5] Drop another deprecated table llx_ecm_documents (replace by llx_ecm_files) --- htdocs/install/mysql/migration/4.0.0-5.0.0.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql index be9a6bc81ec..ef4f53c3fb1 100644 --- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql +++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql @@ -25,6 +25,7 @@ ALTER TABLE llx_website ADD COLUMN virtualhost varchar(255) after fk_default_home; DROP TABLE llx_document_generator; +DROP TABLE llx_ecm_documents; From 74f28b3861664f5c132d3e2b180fb3d7d7405cc6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 15 Jul 2016 10:38:13 +0200 Subject: [PATCH 5/5] NEW Complete table llx_ecm_files with field generated_or_uploaded --- htdocs/install/mysql/migration/4.0.0-5.0.0.sql | 4 +++- htdocs/install/mysql/tables/llx_ecm_files.sql | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql index ef4f53c3fb1..1942febb43c 100644 --- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql +++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql @@ -22,7 +22,9 @@ -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup); -ALTER TABLE llx_website ADD COLUMN virtualhost varchar(255) after fk_default_home; +ALTER TABLE llx_website ADD COLUMN virtualhost varchar(255) after fk_default_home; + +ALTER TABLE llx_ecm_files ADD COLUMN gen_or_uploaded varchar(12) after cover; DROP TABLE llx_document_generator; DROP TABLE llx_ecm_documents; diff --git a/htdocs/install/mysql/tables/llx_ecm_files.sql b/htdocs/install/mysql/tables/llx_ecm_files.sql index e984c7c9098..8310c160384 100644 --- a/htdocs/install/mysql/tables/llx_ecm_files.sql +++ b/htdocs/install/mysql/tables/llx_ecm_files.sql @@ -27,7 +27,8 @@ CREATE TABLE llx_ecm_files description text, keywords text, -- list of keywords, separated with comma cover text, -- is this file a file to use for a cover - extraparams varchar(255), -- for stock other parameters with json format + gen_or_uploaded varchar(12), -- 'generated' or 'uploaded' + extraparams varchar(255), -- for stocking other parameters with json format date_c datetime, date_m timestamp, fk_user_c integer,