Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GRN2-176: Create a role editor that allows admins to specify what permissions each role has #709

Merged
merged 22 commits into from
Jul 31, 2019
Merged

GRN2-176: Create a role editor that allows admins to specify what permissions each role has #709

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
1b20198
Add roles editor
shawn-higgins1 Jul 24, 2019
e046326
Add colour selection ability to roles
shawn-higgins1 Jul 24, 2019
7fabcaf
Add ability to assign roles to users in the UI
shawn-higgins1 Jul 26, 2019
29d77cd
Remove rolify and replace it with our own custom roles implemenation
shawn-higgins1 Jul 26, 2019
de65971
- Fix all existing roles functionality
shawn-higgins1 Jul 26, 2019
cb50315
Fix bugs with new customers not have default roles
shawn-higgins1 Jul 29, 2019
70f39af
Add can't create room setting
shawn-higgins1 Jul 29, 2019
17e53f4
Merge in master
shawn-higgins1 Jul 29, 2019
62322e9
Code improvements
shawn-higgins1 Jul 29, 2019
949dfed
Fix migration
shawn-higgins1 Jul 29, 2019
cd3d3e0
Add tests for new methods
shawn-higgins1 Jul 29, 2019
5f21198
Translate reserved role names
shawn-higgins1 Jul 29, 2019
21d11cc
Pull roles from saml/ldap
shawn-higgins1 Jul 30, 2019
edacf56
Fix rspec
shawn-higgins1 Jul 30, 2019
3c0d6cd
Fix scrutinizer issues
shawn-higgins1 Jul 30, 2019
0c5727e
Fix email promoted/demoted tests
shawn-higgins1 Jul 30, 2019
c80b603
Apply comments
shawn-higgins1 Jul 30, 2019
8d3cc65
Redirect directly to the main room
shawn-higgins1 Jul 30, 2019
c141a6f
Add comments
shawn-higgins1 Jul 30, 2019
589a0dd
Merge branch 'master' into add-roles-editor
jfederico Jul 31, 2019
cafabf3
Merge branch 'master' into add-roles-editor
jfederico Jul 31, 2019
6fc3e1c
Merge branch 'master' into add-roles-editor
jfederico Jul 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Redirect directly to the main room
  • Loading branch information
@shawn-higgins1
shawn-higgins1 committed Jul 30, 2019
commit 8d3cc65a67a8d31c807b9b8c48acebf2abf4890a
4 changes: 2 additions & 2 deletions app/controllers/rooms_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,10 @@ def join_specific_room
begin
@room = Room.find_by(uid: room_uid)
rescue ActiveRecord::RecordNotFound
return redirect_to room_path(current_user.main_room), alert: I18n.t("room.no_room.invalid_room_uid")
return redirect_to current_user.main_room, alert: I18n.t("room.no_room.invalid_room_uid")
end

return redirect_to room_path(current_user.main_room), alert: I18n.t("room.no_room.invalid_room_uid") if @room.nil?
return redirect_to current_user.main_room, alert: I18n.t("room.no_room.invalid_room_uid") if @room.nil?

redirect_to room_path(@room)
end
Expand Down