Skip to content
Merged
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions htdocs/public/ticket/list.php
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok for me, use case is:

  • dolibarr as a public ticket system
  • customer have 2 companies and open one ticket on each thirdparty
  • first link is send by email : he can clic and read it no problem, then he can clic on list
  • second link is send by email : he can read it no problem but link back to list is a fail -> view @lvessiller-opendsi screenshot

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@
unset($_SESSION['track_id_customer']);
unset($_SESSION['email_customer']);
}
if (isset($_SESSION['track_id_customer'])) {
if (empty($track_id) && isset($_SESSION['track_id_customer'])) {
$track_id = $_SESSION['track_id_customer'];
}
if (isset($_SESSION['email_customer'])) {
if (empty($email) && isset($_SESSION['email_customer'])) {
$email = strtolower($_SESSION['email_customer']);
}

Expand Down Expand Up @@ -209,6 +209,7 @@

// Store current page url
$url_page_current = dol_buildpath('/public/ticket/list.php', 1);
$contextpage = $url_page_current;

// Do we click on purge search criteria ?
if (GETPOST("button_removefilter_x")) {
Expand Down Expand Up @@ -266,7 +267,7 @@
if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
if ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate') {
$enabled = abs(dol_eval($extrafields->attributes[$object->table_element]['list'][$key], 1, 1, 0));
$enabled = abs((int) dol_eval($extrafields->attributes[$object->table_element]['list'][$key], 1, 1, 0));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok for me, same solution in develop

$enabled = (($enabled == 0 || $enabled == 3) ? 0 : $enabled);
$arrayfields["ef.".$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'checked' => ($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1, 'position' => $extrafields->attributes[$object->table_element]['pos'][$key], 'enabled' => $enabled && $extrafields->attributes[$object->table_element]['perms'][$key]);
}
Expand Down