rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-01 21:52:19 +01:00
Code Issues Releases Activity

Merge branch 'dev' into staging

Browse Source
This commit is contained in:
Du Peng 2023-07-31 10:19:25 +02:00
commit 91d263401a
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -2,6 +2,7 @@
- adds reservation context feature (for machine, training, space)
- Fix a bug: event reserved places compute error
- Fix a bug: event canceled places error
- [TODO DEPLOY] `rails fablab:es:build_stats`
- [TODO DEPLOY] `rails fablab:maintenance:regenerate_statistics[2014,1]`
- [TODO DEPLOY] `rails fablab:setup:build_places_cache`

1
app/frontend/src/stylesheets/modules/form/form-select.scss
View File

@ -1,4 +1,5 @@
.form-select {
.rs__menu { z-index: 20; }
.rs__menu .rs__menu-list {
.rs__option {
&--is-disabled {

2
app/frontend/templates/events/show.html
View File

@ -240,7 +240,7 @@
</div>
</div>
<div ng-show="isCancelled(reservation)" class="well well-disabled">
<div class="text-italic text-sm">{{ 'app.public.events_show.canceled_reservation_SEATS' | translate:{SEATS:reservation.total_booked_seats} }}</div>
<div class="text-italic text-sm">{{ 'app.public.events_show.canceled_reservation_SEATS' | translate:{SEATS:reservation.nb_reserve_places} }}</div>
</div>
</div>