Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MaarchCourrier
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Harbor Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maarch
MaarchCourrier
Commits
35b7d69b
Commit
35b7d69b
authored
6 years ago
by
Florian Azizian
Browse files
Options
Downloads
Patches
Plain Diff
change basket_res_order by default + fix error confirm_status in indexingBasket
parent
881ba386
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/maarch_entreprise/actions/confirm_status.php
+8
-3
8 additions, 3 deletions
apps/maarch_entreprise/actions/confirm_status.php
sql/1810.sql
+2
-2
2 additions, 2 deletions
sql/1810.sql
with
10 additions
and
5 deletions
apps/maarch_entreprise/actions/confirm_status.php
+
8
−
3
View file @
35b7d69b
...
...
@@ -65,9 +65,14 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module,
$templatesControler
=
new
templates_controler
();
$templates
=
array
();
$stmt
=
$db
->
query
(
"SELECT destination FROM res_letterbox WHERE res_id = (?)"
,
[
$res_id
]);
$resultDest
=
$stmt
->
fetchObject
();
$destination
=
$resultDest
->
destination
;
if
(
is_integer
(
$res_id
)){
$stmt
=
$db
->
query
(
"SELECT destination FROM res_letterbox WHERE res_id = (?)"
,
[
$res_id
]);
$resultDest
=
$stmt
->
fetchObject
();
$destination
=
$resultDest
->
destination
;
}
else
{
$destination
=
''
;
}
if
(
$destination
<>
''
)
{
$templates
=
$templatesControler
->
getAllTemplatesForProcess
(
$destination
);
}
else
{
...
...
This diff is collapsed.
Click to expand it.
sql/1810.sql
+
2
−
2
View file @
35b7d69b
...
...
@@ -19,9 +19,9 @@ ALTER TABLE groupbasket_status DROP COLUMN IF EXISTS "order";
ALTER
TABLE
groupbasket_status
ADD
COLUMN
"order"
integer
;
UPDATE
groupbasket_status
SET
"order"
=
0
WHERE
status_id
=
'NEW'
;
UPDATE
groupbasket_status
SET
"order"
=
1
WHERE
status_id
!=
'NEW'
;
UPDATE
baskets
SET
basket_res_order
=
'res_id'
WHERE
basket_res_order
IS
NULL
;
UPDATE
baskets
SET
basket_res_order
=
'res_id
desc
'
WHERE
basket_res_order
IS
NULL
;
ALTER
TABLE
baskets
ALTER
COLUMN
basket_res_order
SET
NOT
NULL
;
ALTER
TABLE
baskets
ALTER
COLUMN
basket_res_order
SET
DEFAULT
'res_id'
;
ALTER
TABLE
baskets
ALTER
COLUMN
basket_res_order
SET
DEFAULT
'res_id
desc
'
;
ALTER
TABLE
groupbasket_status
ALTER
COLUMN
"order"
SET
NOT
NULL
;
DO
$$
BEGIN
IF
(
SELECT
count
(
TABLE_NAME
)
FROM
INFORMATION_SCHEMA
.
TABLES
WHERE
TABLE_NAME
=
'users_baskets'
)
=
1
THEN
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment