~xibo-maintainers/xibo/tempel

« back to all changes in this revision

Viewing changes to lib/Entity/Display.php

  • Committer: Dan Garner
  • Date: 2016-04-05 12:44:24 UTC
  • mfrom: (487.1.67)
  • Revision ID: git-v1:3ee1212b02c722a146a00e094f0ff69f88fb5c7d
Merge pull request #149 from dasgarner/develop

Post 1.8.0-alpha3 fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
557
557
        // Remove our display from any groups it is assigned to
558
558
        foreach ($this->displayGroups as $displayGroup) {
559
559
            /* @var DisplayGroup $displayGroup */
 
560
            $displayGroup->setChildObjectDependencies($this->displayFactory, $this->layoutFactory, $this->mediaFactory, $this->scheduleFactory);
560
561
            $displayGroup->unassignDisplay($this);
561
562
            $displayGroup->save(['validate' => false]);
562
563
        }
563
564
 
564
565
        // Delete our display specific group
565
566
        $displayGroup = $this->displayGroupFactory->getById($this->displayGroupId);
 
567
        $displayGroup->setChildObjectDependencies($this->displayFactory, $this->layoutFactory, $this->mediaFactory, $this->scheduleFactory);
566
568
        $displayGroup->delete();
567
569
 
568
570
        // Delete the display