bike/BikeBikeBike
1
0
Fork 0
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Fixed error deleting a workshop

Browse Source
This commit is contained in:
Godwin
2016-08-22 11:17:55 -07:00
parent 3940a0b0cc
commit 15483c13df
6 changed files with 303 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/conferences/admin/_select_guest_table.html.haml
+1 -1
View File
@@ -30,7 +30,7 @@
%td=_"articles.conference_registration.questions.housing.#{registration.housing}"
%td=date_span(registration.arrival.to_date, registration.departure.to_date)
- companion = companion(registration)
%td=companion.present? ? (companion.is_a?(User) ? companion.name : (_"articles.conference_registration.terms.registration_status.#{companion}")) : ''
%td=companion.present? ? (companion.is_a?(User) ? companion.named_email : (_"articles.conference_registration.terms.registration_status.#{companion}")) : ''
%td=_"articles.conference_registration.questions.food.#{registration.food}"
%td=registration.allergies
%td
app/views/conferences/admin/_stats.html.haml
+1 -4
View File
@@ -22,7 +22,4 @@
%h4 Registrations
= searchfield :search, nil, big: true
.table-scroller
%table.registrations.admin-edit
%thead
%tr=excel_header_columns(@excel_data)
%tbody#search-rows=excel_rows(@excel_data)
= html_table @excel_data, id: 'search-table', class: ['registrations', 'admin-edit'], primary_key: :id, column_names: [:registration_fees_paid, :city, :preferred_language, :arrival, :departure, :housing, :bike, :food, :companion_email, :allergies], editable: administration_update_path(@this_conference.slug, :stats), column_options: @column_options