- fixed group by for mysql mode - only user can edit own prefs - updated installation README - pagerfanta shows less links - improved manual tab - moved user profile link to pref tabs - added menu links to top navbar - moved page actions to breadcrumb position - integrated daterangepicker and improved toolbar forms - bugfix for time rounding
This commit is contained in:
@@ -32,10 +32,13 @@ class SidebarController extends AbstractController
|
||||
*/
|
||||
public function settingsAction()
|
||||
{
|
||||
return $this->render('sidebar/settings.html.twig', []);
|
||||
$user = $this->getUser();
|
||||
|
||||
return $this->render('sidebar/settings.html.twig', [
|
||||
'user' => $user,
|
||||
]);
|
||||
|
||||
/*
|
||||
$user = $this->getUser();
|
||||
|
||||
$form = $this->createForm(UserPreferencesForm::class, $user, [
|
||||
'action' => $this->generateUrl('user_profile_preferences', ['username' => $user->getUsername()]),
|
||||
|
||||
@@ -90,6 +90,8 @@ trait TimesheetControllerTrait
|
||||
$record->setEnd($end);
|
||||
}
|
||||
|
||||
// TODO validate that end is not before begin
|
||||
|
||||
$entityManager = $this->getDoctrine()->getManager();
|
||||
$entityManager->persist($entry);
|
||||
$entityManager->flush();
|
||||
@@ -132,7 +134,9 @@ trait TimesheetControllerTrait
|
||||
}
|
||||
}
|
||||
|
||||
$entityManager = $this->getDoctrine()->getManager();
|
||||
// TODO validate that end is not before begin
|
||||
|
||||
$entityManager = $this->getDoctrine()->getManager();
|
||||
$entityManager->persist($entry);
|
||||
|
||||
$entityManager->flush();
|
||||
|
||||
Reference in New Issue
Block a user