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.

Sign up for GitHub

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

Feature add screen admin #18

Merged
merged 2 commits into from
Jun 29, 2020
Merged

Feature add screen admin #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea5ca73
ARMSO-31: Added screen admin role
tuj May 22, 2020
9547715
ARMSO-47: Fixed issue with serialization listener
tuj Jun 10, 2020
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
39 changes: 23 additions & 16 deletions EventListener/SerializationListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ function (array $groups) use ($event) {
$urls = array();

// Set media paths
/** @var \Os2Display\CoreBundle\Entity\Slide $slide */
$slide = $event->getObject();
foreach ($slide->getMedia() as $media) {
$providerName = $media->getProviderName();
Expand Down Expand Up @@ -163,20 +164,25 @@ function (array $groups) use ($event) {
$event->getVisitor()->addData('logo', $logoPath);

// Set template paths
/** @var \Os2Display\CoreBundle\Entity\SlideTemplate $template */
$template = $this->container->get('doctrine')->getRepository('Os2DisplayCoreBundle:SlideTemplate')->findOneById($slide->getTemplate());
$event->getVisitor()->addData('template_path', $template->getPathLive());
$event->getVisitor()->addData('path', $template->getPath());
$event->getVisitor()->addData('css_path', $template->getPathCss());
$event->getVisitor()->addData('js_path', $template->getPathJs());
$event->getVisitor()->addData('js_script_id', $template->getScriptId());
$event->getVisitor()->addData('server_path', $this->container->getParameter('absolute_path_to_server'));

if ($template != null) {
$event->getVisitor()->addData('template_path', $template->getPathLive());
$event->getVisitor()->addData('path', $template->getPath());
$event->getVisitor()->addData('css_path', $template->getPathCss());
$event->getVisitor()->addData('js_path', $template->getPathJs());
$event->getVisitor()->addData('js_script_id', $template->getScriptId());
$event->getVisitor()->addData('server_path', $this->container->getParameter('absolute_path_to_server'));
}
}
else {
if (in_array('sharing', $groups)) {
$urls = array();
$thumbs = array();

// Set media paths
/** @var \Os2Display\CoreBundle\Entity\Slide $slide */
$slide = $event->getObject();
foreach ($slide->getMedia() as $media) {
$providerName = $media->getProviderName();
Expand Down Expand Up @@ -218,17 +224,18 @@ function (array $groups) use ($event) {
$event->getVisitor()->addData('logo', $logoPath);

// Set template paths
/** @var \Os2Display\CoreBundle\Entity\SlideTemplate $template */
$template = $this->container->get('doctrine')->getRepository('Os2DisplayCoreBundle:SlideTemplate')->findOneById($slide->getTemplate());
$event->getVisitor()
->addData('preview_path', $template->getPathPreview());
$event->getVisitor()
->addData('template_path', $template->getPathLive());
$event->getVisitor()->addData('path', $template->getPath());
$event->getVisitor()
->addData('css_path', $template->getPathCss());
$event->getVisitor()->addData('js_path', $template->getPathJs());
$event->getVisitor()->addData('js_script_id', $template->getScriptId());
$event->getVisitor()->addData('server_path', $this->container->getParameter('absolute_path_to_server'));

if ($template != null) {
$event->getVisitor()->addData('preview_path', $template->getPathPreview());
$event->getVisitor()->addData('template_path', $template->getPathLive());
$event->getVisitor()->addData('path', $template->getPath());
$event->getVisitor()->addData('css_path', $template->getPathCss());
$event->getVisitor()->addData('js_path', $template->getPathJs());
$event->getVisitor()->addData('js_script_id', $template->getScriptId());
$event->getVisitor()->addData('server_path', $this->container->getParameter('absolute_path_to_server'));
}
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion Resources/translations/Os2DisplayCoreBundle.da.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ user:
subject: Din bruger er oprettet på OS2display
title: Hej %name%!
content: Der er blevet oprettet en bruger til dig på OS2display.
activate: For at aktivere din konto skal du besøge følgende link i din browser:
activate: 'For at aktivere din konto skal du besøge følgende link i din browser:'

ROLE_USER: Bruger
ROLE_GROUP_ADMIN: Gruppeadministrator
ROLE_USER_ADMIN: Brugeradministrator
ROLE_ADMIN: Administrator
ROLE_SUPER_ADMIN: Superadministrator
ROLE_SCREEN_ADMIN: Skærmadministrator

ROLE_GROUP_ROLE_USER: Bruger
ROLE_GROUP_ROLE_ADMIN: Administrator
1 change: 1 addition & 0 deletions Security/Roles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ class Roles {
const ROLE_GROUP_ADMIN = 'ROLE_GROUP_ADMIN';
const ROLE_USER_ADMIN = 'ROLE_USER_ADMIN';
const ROLE_SUPER_ADMIN = 'ROLE_SUPER_ADMIN';
const ROLE_SCREEN_ADMIN = 'ROLE_SCREEN_ADMIN';

public static function getRoleNames() {
$class = new \ReflectionClass(static::class);
Expand Down