Skip to content

Commit

Permalink
Fix scope - only tickets are affected
Browse files Browse the repository at this point in the history
"Display delete button" affect only ticket form not the change and problem.

fixes #266
  • Loading branch information
keguira authored and Guillaume RENAUDIE committed Dec 9, 2024
1 parent 22c4333 commit 5680a25
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
4 changes: 1 addition & 3 deletions js/remove_btn.js.php
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,7 @@ function handleEvent() {
$(document).ready(function() {
// only in ticket form
if (location.pathname.indexOf('ticket.form.php') > 0
|| location.pathname.indexOf('problem.form.php') > 0
|| location.pathname.indexOf('change.form.php') > 0) {
if (location.pathname.indexOf('ticket.form.php')) {
$(document).on('glpi.tab.loaded', function() {
let buttons_to_delete = {
Group: {
Expand Down
4 changes: 1 addition & 3 deletions setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@ function plugin_init_escalade()

// on ticket page (in edition)
if (
(strpos($_SERVER['REQUEST_URI'] ?? '', "ticket.form.php") !== false
|| strpos($_SERVER['REQUEST_URI'] ?? '', "problem.form.php") !== false
|| strpos($_SERVER['REQUEST_URI'] ?? '', "change.form.php") !== false) && isset($_GET['id'])
(strpos($_SERVER['REQUEST_URI'] ?? '', "ticket.form.php") !== false) && isset($_GET['id'])
) {
if (
!$escalade_config['remove_delete_requester_user_btn']
Expand Down

0 comments on commit 5680a25

Please sign in to comment.