gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[temp] Add no events happening now in splashpage

Browse source
This commit is contained in:
Jimmy 2021-04-05 20:45:40 +08:00 • committed by CactusPuppy
parent f260139b2d
commit 322a5b40bc
No known key found for this signature in database
GPG key ID: 4B33B0A3E15E2C82
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/schedules_controller.rb
View file

@ -75,7 +75,7 @@ class SchedulesController < ApplicationController
respond_to do |format| respond_to do |format|
format.html format.html
format.json { render json: @events_schedules.as_json(root: false, include: :event) } format.json { render json: @events_schedules.to_json(root: false, include: :event) }
end end
end end

11
app/views/conferences/show.html.haml
View file

@ -46,7 +46,11 @@
-# happening now events -# happening now events
- if @conference.splashpage.include_happening_now - if @conference.splashpage.include_happening_now
= 'test' .row
.col-md-12
#happening_now_panel
%h3.text-center There are no events happening now.
-# calls for content, or program -# calls for content, or program
- if @conference.splashpage.include_cfp - if @conference.splashpage.include_cfp
= render 'call_for_content', conference: @conference, = render 'call_for_content', conference: @conference,
@ -103,4 +107,9 @@
var renderTemplate = function(data) { var renderTemplate = function(data) {
console.log(data); console.log(data);
console.log("template rendered"); console.log("template rendered");
for (key in data) {
event_schedule = data[key];
console.log(event_schedule['event']);
}
} }