Skip to content

Commit

Permalink
Fix(EventLog): Fix SQL error (#12)
Browse files Browse the repository at this point in the history
* Fix(EventLog): Fix SQL error

* Adapt CHANGELOG
  • Loading branch information
stonebuzz authored Dec 27, 2024
1 parent 6aca1b1 commit ea4b1e7
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Fixes

- SQL error when merging the Jamf device linked to a GLPI asset
- SQL error when adding `Event`

## [3.1.1]

Expand Down
2 changes: 1 addition & 1 deletion inc/computersync.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ public static function import(string $itemtype, int $jamf_items_id, $use_transac
]);
if ($iterator->count()) {
// Already imported
Event::log(-1, $itemtype, 4, 'Jamf plugin', "Jamf computer $jamf_items_id not imported. A {$itemtype::getTypeName(1)} exists with the same uuid.");
Event::log(0, $itemtype, 4, 'Jamf plugin', "Jamf computer $jamf_items_id not imported. A {$itemtype::getTypeName(1)} exists with the same uuid.");
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion inc/mobilesync.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@ public static function import(string $itemtype, int $jamf_items_id, $use_transac
}
if ($iterator->count()) {
// Already imported
Event::log(-1, $itemtype, 4, 'Jamf plugin', "Jamf mobile device $jamf_items_id not imported. A {$itemtype::getTypeName(1)} exists with the same uuid.");
Event::log(0, $itemtype, 4, 'Jamf plugin', "Jamf mobile device $jamf_items_id not imported. A {$itemtype::getTypeName(1)} exists with the same uuid.");
return false;
}

Expand Down

0 comments on commit ea4b1e7

Please sign in to comment.