convert timesheets to UTC with support for user timezone (#372)

This commit is contained in:
Kevin Papst
2019-02-08 18:24:33 +01:00
committed by GitHub
parent 8dcc18dde3
commit d00596d297
58 changed files with 1637 additions and 207 deletions

View File

@@ -38,7 +38,7 @@ class ActivityVoter extends AbstractVoter
*/
protected function supports($attribute, $subject)
{
if (!$subject instanceof Activity) {
if (!($subject instanceof Activity)) {
return false;
}
@@ -63,10 +63,6 @@ class ActivityVoter extends AbstractVoter
return false;
}
if ($subject instanceof Activity) {
return $this->hasRolePermission($user, $attribute . '_activity');
}
return false;
return $this->hasRolePermission($user, $attribute . '_activity');
}
}

View File

@@ -38,7 +38,7 @@ class CustomerVoter extends AbstractVoter
*/
protected function supports($attribute, $subject)
{
if (!$subject instanceof Customer) {
if (!($subject instanceof Customer)) {
return false;
}
@@ -63,10 +63,6 @@ class CustomerVoter extends AbstractVoter
return false;
}
if ($subject instanceof Customer) {
return $this->hasRolePermission($user, $attribute . '_customer');
}
return false;
return $this->hasRolePermission($user, $attribute . '_customer');
}
}

View File

@@ -38,7 +38,7 @@ class InvoiceTemplateVoter extends AbstractVoter
*/
protected function supports($attribute, $subject)
{
if (!$subject instanceof InvoiceTemplate) {
if (!($subject instanceof InvoiceTemplate)) {
return false;
}
@@ -63,10 +63,6 @@ class InvoiceTemplateVoter extends AbstractVoter
return false;
}
if ($subject instanceof InvoiceTemplate) {
return $this->hasRolePermission($user, $attribute . '_invoice_template');
}
return false;
return $this->hasRolePermission($user, $attribute . '_invoice_template');
}
}

View File

@@ -38,7 +38,7 @@ class ProjectVoter extends AbstractVoter
*/
protected function supports($attribute, $subject)
{
if (!$subject instanceof Project) {
if (!($subject instanceof Project)) {
return false;
}
@@ -63,10 +63,6 @@ class ProjectVoter extends AbstractVoter
return false;
}
if ($subject instanceof Project) {
return $this->hasRolePermission($user, $attribute . '_project');
}
return false;
return $this->hasRolePermission($user, $attribute . '_project');
}
}

View File

@@ -9,7 +9,6 @@
namespace App\Voter;
use App\Entity\Activity;
use App\Entity\Timesheet;
use App\Entity\User;
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
@@ -49,7 +48,7 @@ class TimesheetVoter extends AbstractVoter
*/
protected function supports($attribute, $subject)
{
if (!$subject instanceof Timesheet) {
if (!($subject instanceof Timesheet)) {
return false;
}
@@ -62,7 +61,7 @@ class TimesheetVoter extends AbstractVoter
/**
* @param string $attribute
* @param Timesheet|Activity $subject
* @param Timesheet $subject
* @param TokenInterface $token
* @return bool
*/
@@ -74,10 +73,6 @@ class TimesheetVoter extends AbstractVoter
return false;
}
if (!($subject instanceof Timesheet)) {
return false;
}
$permission = '';
switch ($attribute) {

View File

@@ -44,11 +44,11 @@ class UserVoter extends AbstractVoter
*/
protected function supports($attribute, $subject)
{
if (!in_array($attribute, self::ALLOWED_ATTRIBUTES)) {
if (!($subject instanceof User)) {
return false;
}
if (!($subject instanceof User)) {
if (!in_array($attribute, self::ALLOWED_ATTRIBUTES)) {
return false;
}