Skip to content

Commit

Permalink
Fix facility reservations table columns
Browse files Browse the repository at this point in the history
  • Loading branch information
joaquinco committed Dec 3, 2024
1 parent 48d0585 commit 62b7194
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/views/facility_reservations/_table_controls.html.haml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%thead
%tr.borderless
%td{ colspan: 8 }= select_all_link
%td{ colspan: 3 }= select_all_link
= render "shared/order_detail_action_form", button_label: t(".update_reservations")
8 changes: 4 additions & 4 deletions app/views/facility_reservations/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
%th.nowrap= sortable "order_number", Order.model_name.human
%th.nowrap= OrderDetail.model_name.human
%th.nowrap= sortable "ordered_for", Order.human_attribute_name(:user)
%th.nowrap{colspan: 2}= sortable "ordered_at", Order.human_attribute_name(:ordered_at)
%th.nowrap{colspan: 2}= sortable "reserve_range", Reservation.human_attribute_name(:reserve_range)
%th.nowrap= sortable "ordered_at", Order.human_attribute_name(:ordered_at)
%th.nowrap= sortable "reserve_range", Reservation.human_attribute_name(:reserve_range)
%th.nowrap.order-note= sortable "product_name", OrderDetail.human_attribute_name(:product)
%th.nowrap= sortable "assigned_to", OrderDetail.human_attribute_name(:assigned_user)
%th.nowrap= sortable "status"
Expand All @@ -39,9 +39,9 @@
%td.centered= link_to od.order_id, facility_order_path(current_facility, order)
%td.centered= link_to od.id, manage_order_detail_path(od), class: "manage-order-detail"
%td= mail_to(order.user.email, order.user.full_name, title: "Compose Email")
%td{colspan: 2}
%td
= format_usa_datetime(od.ordered_at)
%td{colspan: 2}
%td
- if res.admin_editable?
= link_to res, edit_facility_order_order_detail_reservation_path(current_facility, order, od, res)
- else
Expand Down

0 comments on commit 62b7194

Please sign in to comment.