Skip to content

Commit 0d29a95

Browse files
authored
Merge pull request #6273 from LibreSign/backport/6271/stable32
[stable32] fix: envelope validation redirect
2 parents bbfdbf0 + 6410778 commit 0d29a95

4 files changed

Lines changed: 44 additions & 9 deletions

File tree

lib/Controller/SignFileController.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,18 @@ public function sign(string $method, array $elements = [], string $identifyValue
132132
->setVisibleElements($elements)
133133
->sign();
134134

135+
$validationUuid = $libreSignFile->getUuid();
136+
if ($libreSignFile->hasParent()) {
137+
$parentFile = $this->signFileService->getFile($libreSignFile->getParentFileId());
138+
$validationUuid = $parentFile->getUuid();
139+
}
140+
135141
return new DataResponse(
136142
[
137143
'action' => JSActions::ACTION_SIGNED,
138144
'message' => $this->l10n->t('File signed'),
139145
'file' => [
140-
'uuid' => $libreSignFile->getUuid()
146+
'uuid' => $validationUuid
141147
]
142148
],
143149
Http::STATUS_OK

src/components/validation/EnvelopeValidation.vue

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,9 +275,18 @@ export default {
275275
box-shadow: 0 0 6px 0 var(--color-box-shadow);
276276
margin-bottom: 16px;
277277
278-
@media screen and (max-width: 900px) {
279-
padding: 12px;
278+
@media screen and (max-width: 700px) {
279+
padding: 12px 8px;
280280
box-shadow: none;
281+
border-top: 2px solid var(--color-border-dark);
282+
border-radius: 0;
283+
margin-bottom: 0;
284+
margin-top: 12px;
285+
286+
&:first-child {
287+
border-top: none;
288+
margin-top: 0;
289+
}
281290
}
282291
283292
.header {

src/components/validation/FileValidation.vue

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,18 @@ export default {
8282
}
8383
}
8484
85-
@media screen and (max-width: 900px) {
86-
padding: 12px;
85+
@media screen and (max-width: 700px) {
86+
padding: 12px 8px;
8787
box-shadow: none;
88+
border-top: 2px solid var(--color-border-dark);
89+
border-radius: 0;
90+
margin-bottom: 0;
91+
margin-top: 12px;
92+
93+
&:first-child {
94+
border-top: none;
95+
margin-top: 0;
96+
}
8897
}
8998
}
9099
</style>

src/views/Validation.vue

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -624,12 +624,15 @@ export default {
624624
width: 100%;
625625
box-shadow: 0 0 6px 0 var(--color-box-shadow);
626626
627-
@media screen and (max-width: 900px) {
627+
@media screen and (max-width: 700px) {
628628
width: 100%;
629629
display: flex;
630630
justify-content: center;
631631
align-items: center;
632632
max-width: 100%;
633+
padding: 12px;
634+
margin: 12px;
635+
box-shadow: none;
633636
}
634637
}
635638
button {
@@ -647,8 +650,18 @@ export default {
647650
margin-bottom: 10px;
648651
width: unset;
649652
overflow: hidden;
650-
@media screen and (max-width: 900px) {
653+
@media screen and (max-width: 700px) {
651654
max-width: 100%;
655+
padding: 12px 8px;
656+
box-shadow: none;
657+
border-top: 2px solid var(--color-border-dark);
658+
border-radius: 0;
659+
margin-bottom: 0;
660+
margin-top: 12px;
661+
&:first-child {
662+
border-top: none;
663+
margin-top: 0;
664+
}
652665
}
653666
.action-items {
654667
gap: 12px;
@@ -773,8 +786,6 @@ export default {
773786
margin-inline-end: 0;
774787
.section {
775788
width: unset;
776-
box-shadow: none;
777-
padding: 10px !important;
778789
779790
.signers {
780791
.date-signed-desktop {

0 commit comments

Comments
 (0)