Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Greenlight
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Arbeitsgruppe Hardwarenahe IT-Systeme
Greenlight
Commits
f6715b83
Commit
f6715b83
authored
Apr 10, 2019
by
farhatahmad
Committed by
Jesus Federico
Apr 10, 2019
Browse files
Options
Downloads
Patches
Plain Diff
Join meeting name is now stored in a session cookie (#432)
parent
4d648534
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/controllers/rooms_controller.rb
+12
-0
12 additions, 0 deletions
app/controllers/rooms_controller.rb
app/views/rooms/join.html.erb
+1
-1
1 addition, 1 deletion
app/views/rooms/join.html.erb
with
13 additions
and
1 deletion
app/controllers/rooms_controller.rb
+
12
−
0
View file @
f6715b83
...
@@ -56,6 +56,15 @@ class RoomsController < ApplicationController
...
@@ -56,6 +56,15 @@ class RoomsController < ApplicationController
@recordings
=
recs
@recordings
=
recs
@is_running
=
@room
.
running?
@is_running
=
@room
.
running?
else
else
# Get users name
@name
=
if
current_user
current_user
.
name
elsif
cookies
.
encrypted
[
:greenlight_name
]
cookies
.
encrypted
[
:greenlight_name
]
else
""
end
render
:join
render
:join
end
end
end
end
...
@@ -91,6 +100,9 @@ class RoomsController < ApplicationController
...
@@ -91,6 +100,9 @@ class RoomsController < ApplicationController
end
end
end
end
# create or update cookie with join name
cookies
.
encrypted
[
:greenlight_name
]
=
@join_name
unless
cookies
.
encrypted
[
:greenlight_name
]
==
@join_name
if
@room
.
running?
||
@room
.
owned_by?
(
current_user
)
if
@room
.
running?
||
@room
.
owned_by?
(
current_user
)
# Determine if the user needs to join as a moderator.
# Determine if the user needs to join as a moderator.
opts
[
:user_is_moderator
]
=
@room
.
owned_by?
(
current_user
)
opts
[
:user_is_moderator
]
=
@room
.
owned_by?
(
current_user
)
...
...
This diff is collapsed.
Click to expand it.
app/views/rooms/join.html.erb
+
1
−
1
View file @
f6715b83
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
required:
true
,
required:
true
,
class:
"form-control join-form"
,
class:
"form-control join-form"
,
placeholder:
t
(
"enter_your_name"
),
placeholder:
t
(
"enter_your_name"
),
value:
"
#{
current_user
?
current_user
.
name
:
''
}
"
,
value:
"
#{
@name
}
"
,
readonly:
!
current_user
.
nil?
%>
readonly:
!
current_user
.
nil?
%>
<%=
f
.
submit
t
(
"room.join"
),
class:
"btn btn-primary btn-sm col-sm-3 form-control join-form"
%>
<%=
f
.
submit
t
(
"room.join"
),
class:
"btn btn-primary btn-sm col-sm-3 form-control join-form"
%>
</div>
</div>
...
...
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