Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Maarch
MaarchCourrier
Commits
77ebf96d
Commit
77ebf96d
authored
Apr 28, 2022
by
lionel.marie-louise
Browse files
update version application
parent
090e2fce
Changes
3
Hide whitespace changes
Inline
Side-by-side
apps/maarch_entreprise/xml/applicationVersion.xml
View file @
77ebf96d
<?xml version="1.0" encoding="utf-8"?>
<root>
<majorVersion>
19.04
</majorVersion>
<minorVersion>
19.04.2
3
_TMA1
</minorVersion>
<minorVersion>
19.04.2
4
_TMA1
</minorVersion>
</root>
sql/1904.sql
View file @
77ebf96d
...
...
@@ -5,7 +5,7 @@
-- --
-- --
-- *************************************************************************--
UPDATE
parameters
SET
param_value_string
=
'19.04.2
3
'
WHERE
id
=
'database_version'
;
UPDATE
parameters
SET
param_value_string
=
'19.04.2
4
'
WHERE
id
=
'database_version'
;
DELETE
FROM
parameters
WHERE
id
=
'QrCodePrefix'
;
INSERT
INTO
parameters
(
id
,
description
,
param_value_int
)
VALUES
(
'QrCodePrefix'
,
'Si activé (1), ajoute "Maarch_" dans le contenu des QrCode générés. (Utilisable avec MaarchCapture >= 1.4)'
,
0
);
...
...
src/core/controllers/AutoCompleteController.php
View file @
77ebf96d
...
...
@@ -291,14 +291,14 @@ class AutoCompleteController
$idToDisplay
,
SORT_ASC
,
SORT_STRING
,
$autocompleteData
);
for
(
$i
=
0
;
$i
<
(
integer
)
$data
[
'numItem'
]
;
$i
++
)
{
//sgami-st maarch-dev#80 liste de valeur à null
//sgami-st maarch-dev#80 liste de valeur à null
$newArrayData
=
[];
for
(
$i
=
0
;
$i
<
(
integer
)
$data
[
'numItem'
]
;
$i
++
)
{
if
(
!
empty
(
$autocompleteData
[
$i
]))
{
$newArrayData
[]
=
$autocompleteData
[
$i
];
}
//sgami-end
}
}
//sgami-end
return
$response
->
withJson
(
$newArrayData
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment