release 1.14 (#2498)
This commit is contained in:
@@ -12,9 +12,11 @@ namespace App\Entity;
|
||||
use App\Constants;
|
||||
use App\Export\Annotation as Exporter;
|
||||
use App\Utils\StringHelper;
|
||||
use DateTime;
|
||||
use Doctrine\Common\Collections\ArrayCollection;
|
||||
use Doctrine\Common\Collections\Collection;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
use Exception;
|
||||
use FOS\UserBundle\Model\User as BaseUser;
|
||||
use JMS\Serializer\Annotation as Serializer;
|
||||
use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
|
||||
@@ -67,7 +69,6 @@ class User extends BaseUser implements UserInterface
|
||||
public const ROLE_USER = 'ROLE_USER';
|
||||
public const ROLE_TEAMLEAD = 'ROLE_TEAMLEAD';
|
||||
public const ROLE_ADMIN = 'ROLE_ADMIN';
|
||||
public const ROLE_SUPER_ADMIN = 'ROLE_SUPER_ADMIN';
|
||||
|
||||
public const DEFAULT_ROLE = self::ROLE_USER;
|
||||
public const DEFAULT_LANGUAGE = Constants::DEFAULT_LOCALE;
|
||||
@@ -110,7 +111,7 @@ class User extends BaseUser implements UserInterface
|
||||
/**
|
||||
* Registration date for the user
|
||||
*
|
||||
* @var \DateTime
|
||||
* @var DateTime
|
||||
*
|
||||
* @Exporter\Expose(label="profile.registration_date", type="datetime")
|
||||
*
|
||||
@@ -207,7 +208,7 @@ class User extends BaseUser implements UserInterface
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct();
|
||||
$this->registeredAt = new \DateTime();
|
||||
$this->registeredAt = new DateTime();
|
||||
$this->preferences = new ArrayCollection();
|
||||
$this->teams = new ArrayCollection();
|
||||
}
|
||||
@@ -217,12 +218,12 @@ class User extends BaseUser implements UserInterface
|
||||
return $this->id;
|
||||
}
|
||||
|
||||
public function getRegisteredAt(): ?\DateTime
|
||||
public function getRegisteredAt(): ?DateTime
|
||||
{
|
||||
return $this->registeredAt;
|
||||
}
|
||||
|
||||
public function setRegisteredAt(\DateTime $registeredAt): User
|
||||
public function setRegisteredAt(DateTime $registeredAt): User
|
||||
{
|
||||
$this->registeredAt = $registeredAt;
|
||||
|
||||
@@ -374,6 +375,11 @@ class User extends BaseUser implements UserInterface
|
||||
return $this->getPreferenceValue(UserPreference::FIRST_WEEKDAY, User::DEFAULT_FIRST_WEEKDAY);
|
||||
}
|
||||
|
||||
public function isSmallLayout(): bool
|
||||
{
|
||||
return $this->getPreferenceValue('theme.layout', 'fixed') === 'boxed';
|
||||
}
|
||||
|
||||
public function setTimezone(?string $timezone)
|
||||
{
|
||||
if ($timezone === null) {
|
||||
@@ -387,7 +393,7 @@ class User extends BaseUser implements UserInterface
|
||||
* @param mixed $default
|
||||
* @return bool|int|null|string
|
||||
*/
|
||||
public function getPreferenceValue($name, $default = null)
|
||||
public function getPreferenceValue(string $name, $default = null)
|
||||
{
|
||||
$preference = $this->getPreference($name);
|
||||
if (null === $preference) {
|
||||
@@ -480,7 +486,7 @@ class User extends BaseUser implements UserInterface
|
||||
* @internal immutable property that cannot be set by plugins
|
||||
* @param bool $canSeeAllData
|
||||
* @return bool
|
||||
* @throws \Exception
|
||||
* @throws Exception
|
||||
*/
|
||||
public function initCanSeeAllData(bool $canSeeAllData): bool
|
||||
{
|
||||
|
||||
@@ -39,6 +39,7 @@ class CalendarViewType extends AbstractType
|
||||
$resolver->setDefaults([
|
||||
'required' => true,
|
||||
'choices' => $choices,
|
||||
'search' => false,
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
@@ -32,7 +32,8 @@ class FirstWeekDayType extends AbstractType
|
||||
'multiple' => false,
|
||||
'choices' => $choices,
|
||||
'label' => 'first_weekday',
|
||||
'translation_domain' => 'system-configuration'
|
||||
'translation_domain' => 'system-configuration',
|
||||
'search' => false,
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
@@ -28,7 +28,8 @@ class ThemeLayoutType extends AbstractType
|
||||
'choices' => [
|
||||
'fixed' => 'fixed',
|
||||
'boxed' => 'boxed',
|
||||
]
|
||||
],
|
||||
'search' => false,
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
@@ -76,7 +76,7 @@ final class MarkdownExtension implements RuntimeExtensionInterface
|
||||
* @param bool $fullLength
|
||||
* @return string
|
||||
*/
|
||||
public function commentOneLiner(?string $content, bool $fullLength = false): string
|
||||
public function commentOneLiner(?string $content, bool $fullLength = true): string
|
||||
{
|
||||
if (empty($content)) {
|
||||
return '';
|
||||
|
||||
Reference in New Issue
Block a user