Skip to content

Commit cea7b30

Browse files
authored
oprava zobrazeni detailu programu (#763)
1 parent 0b2fac0 commit cea7b30

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

app/AdminModule/Presenters/AdminBasePresenter.php

-2
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,6 @@ public function beforeRender() : void
125125

126126
$this->template->settings = $this->settingsService;
127127

128-
$this->template->containerAttributes = '';
129-
130128
$skautIsUserId = $this->dbuser->getSkautISUserId();
131129
$skautIsRoles = $this->skautIsService->getUserRoles($skautIsUserId);
132130
$skautIsRoleSelectedId = $this->skautIsService->getUserRoleId();

app/AdminModule/Presenters/templates/@layout.latte

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{include main-menu}
2121
</div>
2222

23-
<div class="container-fluid" {$containerAttributes|noescape}>
23+
<div class="container-fluid">
2424
<div id="content" class="row">
2525
<div id="sidebar" class="col-3" n:ifcontent>
2626
{ifset #sidebar}

app/AdminModule/ProgramModule/Presenters/SchedulePresenter.php

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ class SchedulePresenter extends ProgramBasePresenter
2222
*/
2323
public function renderDefault() : void
2424
{
25-
$this->template->containerAttributes = 'ng-app="scheduleApp" ng-controller="AdminScheduleCtrl"';
2625
$this->template->isAllowedModifySchedule = $this->settingsService->getBoolValue(Settings::IS_ALLOWED_MODIFY_SCHEDULE);
2726
}
2827
}

app/assets/web/schedule/Calendar.vue

+6-5
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
</div>
1010
<div class="modal-body">
1111
<ul class="list-unstyled">
12-
<li ng-if="event.block.category">
12+
<li v-if="selectedEventInfo.event.extendedProps.block.category">
1313
<strong>Kategorie: </strong>
1414
{{ selectedEventInfo.event.extendedProps.block.category }}
1515
</li>
16-
<li ng-if="event.room">
16+
<li v-if="selectedEventInfo.event.getResources().length > 0">
1717
<strong>Místnost: </strong>
18-
{{ selectedEventInfo.event.getResources().length > 0 ? selectedEventInfo.event.getResources()[0].title : ''}}
18+
{{ selectedEventInfo.event.getResources()[0].title }}
1919
</li>
2020
<li>
2121
<strong>Obsazenost: </strong>
@@ -26,7 +26,7 @@
2626
</li>
2727
</ul>
2828

29-
<div ng-if="event.block.lectors">
29+
<div v-if="selectedEventInfo.event.extendedProps.block.lectors.length > 0">
3030
<h6>Lektoři</h6>
3131
<div v-for="lector in selectedEventInfo.event.extendedProps.block.lectors">
3232
<b>{{ lector.name }}</b>
@@ -166,7 +166,8 @@
166166
],
167167
defaultView: localStorage.getItem("fcDefaultView") || "timeGridSeminar",
168168
selectedEventInfo: null,
169-
userAllowedRegisterPrograms: userAllowedRegisterPrograms
169+
userAllowedRegisterPrograms: userAllowedRegisterPrograms,
170+
basePath: basePath
170171
}
171172
},
172173
computed: {

0 commit comments

Comments
 (0)