forked from bigbluebutton/greenlight
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
GRN2-176: Create a role editor that allows admins to specify what per…
…missions each role has (bigbluebutton#709) * Add roles editor * Add colour selection ability to roles * Add ability to assign roles to users in the UI * Remove rolify and replace it with our own custom roles implemenation * - Fix all existing roles functionality - Fix super admins * Fix bugs with new customers not have default roles * Add can't create room setting * Code improvements * Fix migration * Add tests for new methods * Translate reserved role names * Pull roles from saml/ldap * Fix rspec * Fix scrutinizer issues * Fix email promoted/demoted tests * Apply comments * Redirect directly to the main room * Add comments
- Loading branch information
1 parent
02b342b
commit 4fc1714
Showing
56 changed files
with
1,718 additions
and
333 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -32,6 +32,9 @@ vendor/bundle | |
.env | ||
env | ||
|
||
# Ignore yarn configs | ||
/node_modules | ||
|
||
# IDEs | ||
.idea | ||
.idea/** | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
// BigBlueButton open source conferencing system - http://www.bigbluebutton.org/. | ||
// | ||
// Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below). | ||
// | ||
// This program is free software; you can redistribute it and/or modify it under the | ||
// terms of the GNU Lesser General Public License as published by the Free Software | ||
// Foundation; either version 3.0 of the License, or (at your option) any later | ||
// version. | ||
// | ||
// BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY | ||
// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
// PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. | ||
// | ||
// You should have received a copy of the GNU Lesser General Public License along | ||
// with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. | ||
|
||
$(document).on('turbolinks:load', function(){ | ||
var controller = $("body").data('controller'); | ||
var action = $("body").data('action'); | ||
if ((controller == "admins" && action == "edit_user") || (controller == "users" && action == "edit")) { | ||
$(".setting-btn").click(function(data){ | ||
var url = $("body").data("relative-root") | ||
if (!url.endsWith("/")) { | ||
url += "/" | ||
} | ||
url += "admins?setting=" + data.target.id | ||
|
||
window.location.href = url | ||
}) | ||
|
||
// Clear the role when the user clicks the x | ||
$(".clear-role").click(clearRole) | ||
|
||
// When the user selects an item in the dropdown add the role to the user | ||
$("#role-select-dropdown").change(function(data){ | ||
var dropdown = $("#role-select-dropdown"); | ||
var select_role_id = dropdown.val(); | ||
|
||
if(select_role_id){ | ||
// Disable the role in the dropdown | ||
var selected_role = dropdown.find('[value=\"' + select_role_id + '\"]'); | ||
selected_role.prop("disabled", true) | ||
|
||
// Add the role tag | ||
var tag_container = $("#role-tag-container"); | ||
tag_container.append("<span id=\"user-role-tag_" + select_role_id + "\" style=\"background-color:" + selected_role.data("colour") + ";\" class=\"tag\">" + | ||
selected_role.text() + "<a data-role-id=\"" + select_role_id + "\" class=\"tag-addon clear-role\"><i data-role-id=\"" + select_role_id + "\" class=\"fas fa-times\"></i></a></span>"); | ||
|
||
// Update the role ids input that gets submited on user update | ||
var role_ids = $("#user_role_ids").val() | ||
role_ids += " " + select_role_id | ||
$("#user_role_ids").val(role_ids) | ||
|
||
// Add the clear role function to the tag | ||
$("#user-role-tag_" + select_role_id).click(clearRole); | ||
|
||
// Reset the dropdown | ||
dropdown.val(null) | ||
} | ||
}) | ||
} | ||
}) | ||
|
||
// This function removes the specfied role from a user | ||
function clearRole(data){ | ||
// Get the role id | ||
var role_id = $(data.target).data("role-id"); | ||
var role_tag = $("#user-role-tag_" + role_id); | ||
|
||
// Remove the role tag | ||
$(role_tag).remove() | ||
|
||
// Update the role ids input | ||
var role_ids = $("#user_role_ids").val() | ||
var parsed_ids = role_ids.split(' ') | ||
|
||
var index = parsed_ids.indexOf(role_id.toString()); | ||
|
||
if (index > -1) { | ||
parsed_ids.splice(index, 1); | ||
} | ||
|
||
$("#user_role_ids").val(parsed_ids.join(' ')) | ||
|
||
// Enable the role in the role select dropdown | ||
var selected_role = $("#role-select-dropdown").find('[value=\"' + role_id + '\"]'); | ||
selected_role.prop("disabled", false) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.