diff --git a/app/views/api/event/index.jbuilder b/app/views/api/event/index.jbuilder index 674e42e..4b1c353 100644 --- a/app/views/api/event/index.jbuilder +++ b/app/views/api/event/index.jbuilder @@ -7,7 +7,7 @@ json.group do json.end_date @group.end_date json.event_tags @group.event_tags json.tracks @group.tracks - # json.venues @group.venues + json.venues @group.venues end json.events @events do |event| diff --git a/app/views/api/event/list.jbuilder b/app/views/api/event/list.jbuilder deleted file mode 100644 index 4b1c353..0000000 --- a/app/views/api/event/list.jbuilder +++ /dev/null @@ -1,50 +0,0 @@ -json.group do - json.handle @group.handle - json.nickname @group.nickname - json.id @group.id - json.timezone @group.timezone - json.start_date @group.start_date - json.end_date @group.end_date - json.event_tags @group.event_tags - json.tracks @group.tracks - json.venues @group.venues -end - -json.events @events do |event| - json.extract! event, :id, :title, :event_type, :start_time, :end_time, :timezone, :meeting_url, :location, :formatted_address, :geo_lat, :geo_lng, :cover_url, :require_approval, :tags, :max_participant, :min_participant, :participants_count, :badge_class_id, :external_url - - json.host_info (event.host_info.present? ? JSON.parse(event.host_info) : nil) - # json.host_info event.parse_host_info - - if event.owner - json.owner do - json.extract! event.owner, :id, :handle, :username, :nickname, :image_url - end - else - json.owner nil - end - - if event.venue - json.venue do - json.extract! event.venue, :id, :title, :about, :location, :location_viewport, :formatted_address, :link, :capacity, :geo_lat, :geo_lng, :tags - end - else - json.venue nil - end - - if event.group - json.group do - json.extract! event.group, :id, :handle, :username, :nickname, :timezone - end - else - json.group nil - end - - # json.tickets event.tickets do |ticket| - # json.extract! ticket, :id, :title, :content, :ticket_type, :quantity, :end_time, :need_approval, :status, :zupass_event_id, :zupass_product_id, :zupass_product_name, :start_date, :end_date, :days_allowed, :tracks_allowed - # end - - json.event_roles event.event_roles do |event_role| - json.extract! event_role, :id, :role, :group_id, :profile_id, :nickname, :image_url - end -end