Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
rescheduled 🗓️
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
c3lingo
rescheduled 🗓️
Commits
8252b88f
Commit
8252b88f
authored
10 months ago
by
Teal
Browse files
Options
Downloads
Patches
Plain Diff
try again with live
parent
329f61ff
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/channels/conference_channel.rb
+2
-2
2 additions, 2 deletions
app/channels/conference_channel.rb
app/views/conferences/show.html.erb
+1
-2
1 addition, 2 deletions
app/views/conferences/show.html.erb
with
3 additions
and
4 deletions
app/channels/conference_channel.rb
+
2
−
2
View file @
8252b88f
class
ConferenceChannel
<
ApplicationCable
::
Channel
class
ConferenceChannel
<
ApplicationCable
::
Channel
def
subscribed
def
subscribed
#
conference = Conference.find
(
params[:
id
])
conference
=
Conference
.
find
_by
(
slug:
params
[
:
slug
])
#
stream_for conference
stream_for
conference
end
end
def
unsubscribed
def
unsubscribed
...
...
This diff is collapsed.
Click to expand it.
app/views/conferences/show.html.erb
+
1
−
2
View file @
8252b88f
...
@@ -7,7 +7,7 @@ current_time = Time.zone.now.in_time_zone(@conference.time_zone)
...
@@ -7,7 +7,7 @@ current_time = Time.zone.now.in_time_zone(@conference.time_zone)
# current_time = Time.parse(@conference.days.first.strftime("%Y-%m-%d 11:00"))
# current_time = Time.parse(@conference.days.first.strftime("%Y-%m-%d 11:00"))
#current_time = @sessions_by_date[@conference.days.first].first.starts_at.advance(minutes: 5)
#current_time = @sessions_by_date[@conference.days.first].first.starts_at.advance(minutes: 5)
%>
%>
<%=
turbo_
frame_tag
dom_id
(
@conference
)
do
%>
<%=
turbo_
stream_from
@conference
%>
<div>
<div>
<h1
class=
"text-2xl font-bold my-2"
>
<%=
@conference
.
name
%>
</h1>
<h1
class=
"text-2xl font-bold my-2"
>
<%=
@conference
.
name
%>
</h1>
<p
class=
"text-xs mb-6"
>
<p
class=
"text-xs mb-6"
>
...
@@ -135,4 +135,3 @@ current_time = Time.zone.now.in_time_zone(@conference.time_zone)
...
@@ -135,4 +135,3 @@ current_time = Time.zone.now.in_time_zone(@conference.time_zone)
</div>
</div>
<%
end
%>
<%
end
%>
</div>
</div>
<%
end
%>
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment