Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MaarchParapheur
Manage
Activity
Members
Plan
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maarch
MaarchParapheur
Commits
4c48f210
Commit
4c48f210
authored
2 years ago
by
Hamza HRAMCHI
Browse files
Options
Downloads
Patches
Plain Diff
FIX #19031 TIME 0:05 fix History: undefined key
parent
7510f5db
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/app/history/controllers/HistoryController.php
+6
-3
6 additions, 3 deletions
src/app/history/controllers/HistoryController.php
with
6 additions
and
3 deletions
src/app/history/controllers/HistoryController.php
+
6
−
3
View file @
4c48f210
...
...
@@ -210,7 +210,9 @@ class HistoryController
$objects
=
array_column
(
$objects
,
'title'
,
'id'
);
foreach
(
$filteredHistoryIds
as
$key
=>
$objectId
)
{
$history
[
$key
][
'label'
]
=
$objects
[
$objectId
];
if
(
!
empty
(
$key
))
{
$history
[
$key
][
'label'
]
=
$objects
[
$objectId
];
}
}
}
}
...
...
@@ -433,7 +435,7 @@ class HistoryController
}
$queryParams
=
$request
->
getQueryParams
();
if
(
!
empty
(
$queryParams
[
'onlyProof'
])
&&
(
!
$queryParams
[
'onlyProof'
]
||
empty
(
$proofDocument
))
)
{
if
(
!
$queryParams
[
'onlyProof'
]
||
empty
(
$proofDocument
))
{
$formattedHistory
=
HistoryController
::
getFormattedHistory
([
'id'
=>
$args
[
'id'
]]);
$historyXml
=
HistoryController
::
arrayToXml
([
'data'
=>
$formattedHistory
[
'formattedHistory'
],
'xml'
=>
false
]);
$historyXmlPath
=
$tmpPath
.
'maarchProof'
.
$GLOBALS
[
'id'
]
.
"_"
.
rand
()
.
'.xml'
;
...
...
@@ -487,7 +489,8 @@ class HistoryController
}
}
}
if
(
!
empty
(
$queryParams
[
'onlyProof'
])
&&
!
$queryParams
[
'onlyProof'
])
{
if
(
!
$queryParams
[
'onlyProof'
])
{
if
(
$workflowCompleted
&&
(
$queryParams
[
'eSignDocument'
]
??
$hasCertificate
))
{
$contentType
=
'ESIGN'
;
}
...
...
This diff is collapsed.
Click to expand it.
Hamza HRAMCHI
@hamza.hramchi
mentioned in commit
26a553d3
·
2 years ago
mentioned in commit
26a553d3
mentioned in commit 26a553d318c3e6d17c340acd1628c84db9f09da4
Toggle commit list
Hamza HRAMCHI
@hamza.hramchi
mentioned in commit
68ce7fac
·
2 years ago
mentioned in commit
68ce7fac
mentioned in commit 68ce7fac0b1f1ba275783a588f7d95ad5ae6abbc
Toggle commit list
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