Skip to content
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

Jump to bottom

Fix unit tests #2265

Merged
merged 1 commit into from
Jun 6, 2017
Merged

Fix unit tests #2265

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
69 changes: 45 additions & 24 deletions inc/log.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,33 +481,54 @@ static function getHistoryData(CommonDBTM $item, $start=0, $limit=0, $sqlfilter=
}
$tmp['change'] = sprintf(__('%1$s: %2$s'), __('Add a link with an item'),
$data["new_value"]);

if ($data['itemtype'] == 'Ticket') {
if ($data['itemtype_link'] == 'Group') {
$itemtick = new Group_Ticket();
} else if ($data['itemtype_link'] == 'User') {
$itemtick = new Ticket_User();
} else if ($data['itemtype_link'] == 'Supplier') {
$itemtick = new Supplier_Ticket();
switch ($data['itemtype_link']) {
case 'Group':
$itemtick = new Group_Ticket();
break;
case 'User':
$itemtick = new Ticket_User();
break;
case 'Supplier':
$itemtick = new Supplier_Ticket();
break;
case 'KnowbaseItem':
//no user referenced in link
$itemtick = false;
break;
default:
$itemtick = false;
trigger_error(
sprintf(__('Unknown itemtype_link %1$s'), $data['itemtype_link']),
E_USER_ERROR
);
break;
}
$table = $itemtick->getTable();
$key = getForeignKeyFieldForItemType($data['itemtype']);
$itemkey = getForeignKeyFieldForItemType($data['itemtype_link']);
$iditem = trim(substr($data['new_value'], strrpos($data['new_value'], '(')+1,
strrpos($data['new_value'], ')')),')');

foreach($DB->request($table, array($key => $data['items_id'],
$itemkey => $iditem)) as $datalink) {
if ($datalink['type'] == CommonITILActor::REQUESTER) {
$as = __('Requester');
} else if ($datalink['type'] == CommonITILActor::ASSIGN) {
$as = __('Assigned to');
} else if ($datalink['type'] == CommonITILActor::OBSERVER) {
$as = __('Watcher');

if ($itemtick !== false) {
$table = $itemtick->getTable();
$key = getForeignKeyFieldForItemType($data['itemtype']);
$itemkey = getForeignKeyFieldForItemType($data['itemtype_link']);
$iditem = trim(substr($data['new_value'], strrpos($data['new_value'], '(')+1,
strrpos($data['new_value'], ')')), ')');

var_dump(array($key => $data['items_id'],
$itemkey => $iditem));
exit;
foreach ($DB->request($table, array($key => $data['items_id'],
$itemkey => $iditem)) as $datalink) {
if ($datalink['type'] == CommonITILActor::REQUESTER) {
$as = __('Requester');
} else if ($datalink['type'] == CommonITILActor::ASSIGN) {
$as = __('Assigned to');
} else if ($datalink['type'] == CommonITILActor::OBSERVER) {
$as = __('Watcher');
}
$tmp['change'] = sprintf(__('%1$s: %2$s'), __('Add a link with an item'),
sprintf(__('%1$s (%2$s)'), $data["new_value"],
$as));
}
$tmp['change'] = sprintf(__('%1$s: %2$s'), __('Add a link with an item'),
sprintf(__('%1$s (%2$s)'), $data["new_value"],
$as));
}
}
break;
Expand Down