Correct merge
This commit is contained in:
parent
4a5298f4e4
commit
42e39e4897
4 changed files with 12 additions and 4 deletions
|
|
@ -44,7 +44,6 @@ input:focus {
|
|||
font-style: italic;
|
||||
background-color:transparent;
|
||||
font-size: 100%;
|
||||
font-weight: 1.0;
|
||||
padding: 0px;
|
||||
margin: 0px;
|
||||
font-family: sans-serif;
|
||||
|
|
@ -504,7 +503,6 @@ a.detail
|
|||
font-family: 'openSansRegular';
|
||||
text-decoration: underline;
|
||||
display: block;
|
||||
color: #eb2208;
|
||||
font-weight: normal;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -492,7 +492,7 @@ class Document
|
|||
$this->d_filename=$_FILES['file_upload']['name'][$i];
|
||||
$this->d_mimetype=$_FILES['file_upload']['type'][$i];
|
||||
if ( isset($aDescription[$i])) {
|
||||
$description=$aDescription[$i];
|
||||
$description=strip_tags($aDescription[$i]??"");
|
||||
}
|
||||
$this->d_description=$description;
|
||||
// insert into the table
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ if (!defined("NOALYSS_PACKAGE_REPOSITORY")) {
|
|||
if (!defined("SYSINFO_DISPLAY")) {
|
||||
define("SYSINFO_DISPLAY", TRUE);
|
||||
}
|
||||
define("DBVERSION", 192);
|
||||
define("DBVERSION", 193);
|
||||
define("MONO_DATABASE", 25);
|
||||
define("DBVERSIONREPO", 20);
|
||||
define('NOTFOUND', '--not found--');
|
||||
|
|
|
|||
10
include/sql/patch/upgrade192.sql
Normal file
10
include/sql/patch/upgrade192.sql
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
begin;
|
||||
create table action_comment_document (acd_id bigint generated by default as identity primary key
|
||||
, document_id bigint references document(d_id) on delete cascade on update cascade,
|
||||
action_gestion_comment_id bigint references action_gestion_comment(agc_id) on delete cascade on update cascade);
|
||||
|
||||
alter table action_comment_document
|
||||
add constraint action_comment_document_un
|
||||
unique (document_id, action_gestion_comment_id);
|
||||
insert into version (val,v_description) values (193,' 2332: Suivi : ajout fichier lié aux commentaires');
|
||||
commit;
|
||||
Loading…
Add table
Add a link
Reference in a new issue