Skip to content
Snippets Groups Projects
Verified Commit 87a77657 authored by Giovannoni Laurent's avatar Giovannoni Laurent
Browse files

FIX #7559 pb with data model

parent 8975fcb4
No related branches found
No related tags found
No related merge requests found
......@@ -21,7 +21,7 @@ $close_incoming = $_SESSION['modules_loaded']['attachments']['reconciliation']['
// Modification of the incoming document, as deleted
\Resource\models\ResModel::update([
'set' => ['status' => 'DEL'],
'where' => ['res_id = (?)'],
'where' => ['res_id = ?'],
'data' => [$res_id]
]);
......@@ -32,7 +32,7 @@ if($delete_response_project == 'true'){
\SrcCore\models\DatabaseModel::update([
'set' => ['status' => 'DEL'],
'table' => $attachmentTable,
'where' => ["res_id_master = (?) AND identifier = (?) AND status NOT IN ('DEL','TMP') AND attachment_type = 'response_project'"],
'where' => ["res_id_master = ? AND identifier = ? AND status NOT IN ('DEL','TMP') AND attachment_type = 'response_project'"],
'data' => [$res_id_master[0], $tabFormValues['chrono_number']],
]);
......
......@@ -29,6 +29,8 @@
<validationRule name="get_chrono_attachment" extends="standardForm" mode="error">
<parameter name="module" type="identifier" />
<parameter name="index" type="integer" />
<parameter name="type_id" type="string" />
<parameter name="attachment" type="string" />
</validationRule>
<validationRule name="frame_list_attachments" extends="standardForm" mode="error">
......
......@@ -139,6 +139,11 @@ DROP VIEW IF EXISTS res_view_letterbox;
/* Alter table here because view depends on it*/
ALTER TABLE res_letterbox ALTER COLUMN priority TYPE character varying(16);
ALTER TABLE res_attachments ALTER COLUMN priority TYPE character varying(16);
ALTER TABLE res_x ALTER COLUMN priority TYPE character varying(16);
ALTER TABLE res_version_attachments ALTER COLUMN priority TYPE character varying(16);
ALTER TABLE res_version_letterbox ALTER COLUMN priority TYPE character varying(16);
ALTER TABLE res_version_x ALTER COLUMN priority TYPE character varying(16);
--ALTER TABLE for external infos webservice
ALTER TABLE res_letterbox DROP COLUMN IF EXISTS external_id;
......
......@@ -334,7 +334,7 @@ CREATE TABLE res_attachments
work_batch bigint,
origin character varying(50) DEFAULT NULL::character varying,
is_ingoing character(1) DEFAULT NULL::bpchar,
priority smallint,
priority character varying(16),
initiator character varying(50) DEFAULT NULL::character varying,
dest_user character varying(128) DEFAULT NULL::character varying,
coll_id character varying(32) NOT NULL,
......@@ -1416,7 +1416,7 @@ CREATE TABLE res_x
work_batch bigint,
origin character varying(50) DEFAULT NULL::character varying,
is_ingoing character(1) DEFAULT NULL::bpchar,
priority smallint,
priority character varying(16),
arbatch_id bigint DEFAULT NULL,
policy_id character varying(32) DEFAULT NULL::character varying,
cycle_id character varying(32) DEFAULT NULL::character varying,
......@@ -1742,7 +1742,7 @@ CREATE TABLE res_version_letterbox
work_batch bigint,
origin character varying(50) DEFAULT NULL::character varying,
is_ingoing character(1) DEFAULT NULL::bpchar,
priority smallint,
priority character varying(16),
arbatch_id bigint,
policy_id character varying(32),
cycle_id character varying(32),
......@@ -1857,7 +1857,7 @@ CREATE TABLE res_version_x
work_batch bigint,
origin character varying(50) DEFAULT NULL::character varying,
is_ingoing character(1) DEFAULT NULL::bpchar,
priority smallint,
priority character varying(16),
arbatch_id bigint,
policy_id character varying(32),
cycle_id character varying(32),
......@@ -2470,7 +2470,7 @@ CREATE TABLE res_version_attachments
work_batch bigint,
origin character varying(50) DEFAULT NULL::character varying,
is_ingoing character(1) DEFAULT NULL::bpchar,
priority smallint,
priority character varying(16),
arbatch_id bigint,
policy_id character varying(32),
cycle_id character varying(32),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment