jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

billable timesheets, inactive projects report, bookmark export search (#2503)

Browse Source
This commit is contained in:
Kevin Papst
2021-04-18 21:51:27 +02:00
committed by GitHub
parent 8664d94ea6
commit 0330f45c6a
97 changed files with 1516 additions and 664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/EventSubscriber/Actions/ProjectSubscriber.php
View File

@@ -30,7 +30,7 @@ class ProjectSubscriber extends AbstractActionsSubscriber
return;
}
if ($this->isGranted('view', $project)) {
if (!$event->isView('project_details') && $this->isGranted('view', $project)) {
$event->addAction('details', ['url' => $this->path('project_details', ['id' => $project->getId()])]);
}
@@ -68,8 +68,8 @@ class ProjectSubscriber extends AbstractActionsSubscriber
$event->addAction('copy', ['url' => $this->path('admin_project_duplicate', ['id' => $project->getId()])]);
}
if ($event->isIndexView() && $this->isGranted('delete', $project)) {
$event->addAction('trash', ['url' => $this->path('admin_project_delete', ['id' => $project->getId()]), 'class' => 'modal-ajax-form text-red']);
if (($event->isIndexView() || $event->isView('customer_details')) && $this->isGranted('delete', $project)) {
$event->addDelete($this->path('admin_project_delete', ['id' => $project->getId()]));
}
}
}