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.

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

fixes wrong url in activitylog for scheduledowntime #2456 #2507

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
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
6 changes: 6 additions & 0 deletions library/Director/Web/Table/ActivityLogTable.php
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,16 @@
if ($type === 'service' || $this->hasObjectFilter) {
$object = "\"$name\"";
} else {
$delimiter = $type === 'scheduled_downtime' ? '-' : '';
$object = Link::create(
"\"$name\"",
'director/' . str_replace('_', $delimiter, $type),
['name' => $name],
['title' => $this->translate('Jump to this object')]
);

Check failure on line 223 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 7.2 on ubuntu-latest

Syntax error, unexpected ',' on line 223

Check failure on line 223 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 7.3 on ubuntu-latest

Syntax error, unexpected ',' on line 223

Check failure on line 223 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 7.4 on ubuntu-latest

Syntax error, unexpected ',' on line 223

Check failure on line 223 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 8.0 on ubuntu-latest

Syntax error, unexpected ',' on line 223

Check failure on line 223 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 8.1 on ubuntu-latest

Syntax error, unexpected ',' on line 223

Check failure on line 223 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 8.2 on ubuntu-latest

Syntax error, unexpected ',' on line 223

Check failure on line 223 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 8.3 on ubuntu-latest

Syntax error, unexpected ',' on line 223
}

Check failure on line 224 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 7.2 on ubuntu-latest

Syntax error, unexpected ',' on line 224

Check failure on line 224 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 7.3 on ubuntu-latest

Syntax error, unexpected ',' on line 224

Check failure on line 224 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 7.4 on ubuntu-latest

Syntax error, unexpected ',' on line 224

Check failure on line 224 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 8.0 on ubuntu-latest

Syntax error, unexpected ',' on line 224

Check failure on line 224 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 8.1 on ubuntu-latest

Syntax error, unexpected ',' on line 224

Check failure on line 224 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 8.2 on ubuntu-latest

Syntax error, unexpected ',' on line 224

Check failure on line 224 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 8.3 on ubuntu-latest

Syntax error, unexpected ',' on line 224
'director/' . str_replace('_', '', $type),
['name' => $name],

Check failure on line 226 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 7.2 on ubuntu-latest

Syntax error, unexpected ')' on line 226

Check failure on line 226 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 7.3 on ubuntu-latest

Syntax error, unexpected ')' on line 226

Check failure on line 226 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 7.4 on ubuntu-latest

Syntax error, unexpected ')' on line 226

Check failure on line 226 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 8.0 on ubuntu-latest

Syntax error, unexpected ')' on line 226

Check failure on line 226 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 8.1 on ubuntu-latest

Syntax error, unexpected ')' on line 226

Check failure on line 226 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 8.2 on ubuntu-latest

Syntax error, unexpected ')' on line 226

Check failure on line 226 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 8.3 on ubuntu-latest

Syntax error, unexpected ')' on line 226
['title' => $this->translate('Jump to this object')]
);
}
Expand All @@ -231,7 +237,7 @@
['title' => $this->translate('Show details related to this change')]
),
str_replace('_', ' ', $type),
$object

Check failure on line 240 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 7.2 on ubuntu-latest

Syntax error, unexpected T_ELSE on line 240

Check failure on line 240 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 7.3 on ubuntu-latest

Syntax error, unexpected T_ELSE on line 240

Check failure on line 240 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 7.4 on ubuntu-latest

Syntax error, unexpected T_ELSE on line 240

Check failure on line 240 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 8.0 on ubuntu-latest

Syntax error, unexpected T_ELSE on line 240

Check failure on line 240 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 8.1 on ubuntu-latest

Syntax error, unexpected T_ELSE on line 240

Check failure on line 240 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 8.2 on ubuntu-latest

Syntax error, unexpected T_ELSE on line 240

Check failure on line 240 in library/Director/Web/Table/ActivityLogTable.php

View workflow job for this annotation

GitHub Actions / Static analysis for php 8.3 on ubuntu-latest

Syntax error, unexpected T_ELSE on line 240
];
} else {
return sprintf(
Expand Down
Loading