Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
diegosteiner committed Nov 30, 2024
2 parents e6c9988 + 19d6c4f commit 3271b1b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/views/manage/bookings/show.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
dt= Booking.human_attribute_name(:state)
dd= @booking.booking_state.translate

- if @booking.deadline.present?
- if @booking.deadline&.at.present?
dt= Deadline.model_name.human
dd= link_to l(@booking.deadline.at, format: :short), edit_manage_booking_deadline_path(@booking)

Expand Down
2 changes: 1 addition & 1 deletion app/views/public/bookings/_form.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
= @booking.errors.full_messages.to_sentence
= image_tag current_organisation.logo, class: 'mx-auto d-block m-4', style: 'max-width: 180px; max-height: 180px;' if current_organisation&.logo.present?
fieldset
- if @booking.deadline
- if @booking.deadline&.at
.mb-3
label=Booking.human_attribute_name(:deadline)
div
Expand Down

0 comments on commit 3271b1b

Please sign in to comment.