Skip to content

#645 [SessionCard] fix: use saturne for lock and archive #646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
evarisk-kilyan wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

#645 [SessionCard] fix: use saturne for lock and archive #646

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccd965b
#645 [SessionCard] fix: use saturne for lock and archive
evarisk-kilyan Sep 13, 2024
e833576
#645 [SessionCard] add: confirm box on archive
evarisk-kilyan Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions view/session/session_card.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
require_once __DIR__ . '/../../../saturne/core/tpl/documents/saturne_manual_pdf_generation_action.tpl.php';

// Action confirm_lock, confirm_archive.
require_once __DIR__ . '/../../../saturne/core/tpl/signature/signature_action_workflow.tpl.php';
require_once __DIR__ . '/../../../saturne/core/tpl/actions/object_workflow_actions.tpl.php';

// Actions to send emails.
$triggersendname = strtoupper($object->element) . '_SENTBYMAIL';
Expand Down Expand Up @@ -654,7 +654,7 @@
// Archive.
$displayButton = $onPhone ? '<i class="fas fa-archive fa-2x"></i>' : '<i class="fas fa-archive"></i>' . ' ' . $langs->trans('Archive');
if ($object->status == $object::STATUS_LOCKED) {
print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&object_type=' . $object->element . '&action=confirm_archive&token=' . newToken() . '">' . $displayButton . '</a>';
print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&object_type=' . $object->element . '&action=confirm_archive&forcebuilddoc=true&token=' . newToken() . '">' . $displayButton . '</a>';
} else {
print '<span class="butActionRefused classfortooltip" title="' . dol_escape_htmltag($langs->trans('ObjectMustBeLockedToArchive', ucfirst($langs->transnoentities('The' . ucfirst($object->element))))) . '">' . $displayButton . '</span>';
}
Expand Down