#2864 [Evaluator] add: getpost job after create digiriskusers

Evarisk · Dec 20, 2022 · 16124a4 · 16124a4
1 parent e09377c
commit 16124a4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/view/digiriskelement/digiriskelement_evaluator.php b/view/digiriskelement/digiriskelement_evaluator.php
@@ -476,7 +476,7 @@
 							print '<table><tr>';
 							print '<td>';
 							print $form->selectarray('fk_user_employer', $userlist, (GETPOST('userid') ? GETPOST('userid') : $usertmp->id), $langs->trans('SelectUser'), null, null, null, "40%", 0, 0, '', 'minwidth300', 1);
-							print ' <a href="' . dol_buildpath('custom/digiriskdolibarr/view/digiriskusers.php?backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?id=' . $id . '&userid=USERID&modalactive=1') . '#addUser', 1) . '"><span class="fa fa-plus-circle valignmiddle paddingleft" title="' . $langs->trans("AddUser") . '"></span></a>';
+							print ' <a href="' . dol_buildpath('custom/digiriskdolibarr/view/digiriskusers.php?backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?id=' . $id . '&userid=USERID&modalactive=1&job=JOB') . '#addUser', 1) . '"><span class="fa fa-plus-circle valignmiddle paddingleft" title="' . $langs->trans("AddUser") . '"></span></a>';
 							print '</td></tr></table>';
 							?>
 						</div>
@@ -491,7 +491,7 @@
 							</div>
 							<div class="evaluator-job">
 								<span class="title"><?php echo $langs->trans('PostOrFunction'); ?></span>
-								<span class=""><input type="text" class="evaluatorJob" name="evaluatorJob" value="<?php echo $usertmp->job; ?>"></span>
+								<span class=""><input type="text" class="evaluatorJob" name="evaluatorJob" value="<?php echo (!empty(GETPOST('job')) ? GETPOST('job') : $usertmp->job) ?>"></span>
 							</div>
 						</div>
 					</div>

diff --git a/view/digiriskusers.php b/view/digiriskusers.php
@@ -288,6 +288,7 @@
 
 			if ($backtopage) {
 				$urltogo = str_replace('USERID', $id, $backtopage);
+				$urltogo = str_replace('JOB', $object->job, $urltogo);
 				header("Location: " . $urltogo);
 			} else {
 				header("Location: " . $_SERVER['PHP_SELF']);