forked from External/greenlight
		
	GRN2-247: Added Active Pending Banned Deleted tabs to manage users (#816)
* Added Active Pending Banned Deleted tabs to manage users * Removed hard coded strings * Fixed issues with sign in flow * Fixed issues with rooms not deleting
This commit is contained in:
		
				
					committed by
					
						
						Jesus Federico
					
				
			
			
				
	
			
			
			
						parent
						
							03bde37a2b
						
					
				
				
					commit
					49def8f405
				
			@@ -21,17 +21,6 @@ $(document).on('turbolinks:load', function(){
 | 
			
		||||
  // Only run on the admins page.
 | 
			
		||||
  if (controller == "admins") {
 | 
			
		||||
    if(action == "index") {
 | 
			
		||||
      // show the modal with the correct form action url
 | 
			
		||||
      $(".delete-user").click(function(data){
 | 
			
		||||
        var uid = $(data.target).closest("tr").data("user-uid")
 | 
			
		||||
        var url = $("body").data("relative-root")
 | 
			
		||||
        if (!url.endsWith("/")) {
 | 
			
		||||
          url += "/"
 | 
			
		||||
        }
 | 
			
		||||
        url += "u/" + uid
 | 
			
		||||
        $("#delete-confirm").parent().attr("action", url)
 | 
			
		||||
      })
 | 
			
		||||
 | 
			
		||||
      //clear the role filter if user clicks on the x
 | 
			
		||||
      $(".clear-role").click(function() {
 | 
			
		||||
        var search = new URL(location.href).searchParams.get('search')
 | 
			
		||||
@@ -44,6 +33,14 @@ $(document).on('turbolinks:load', function(){
 | 
			
		||||
      
 | 
			
		||||
        window.location.replace(url);
 | 
			
		||||
      })
 | 
			
		||||
 | 
			
		||||
      // Handle selected user tags
 | 
			
		||||
      $(".manage-users-tab").click(function() {
 | 
			
		||||
        $(".manage-users-tab").removeClass("selected")
 | 
			
		||||
        $(this).addClass("selected")
 | 
			
		||||
 | 
			
		||||
        updateTabParams(this.id)
 | 
			
		||||
      })
 | 
			
		||||
    }
 | 
			
		||||
    else if(action == "site_settings"){
 | 
			
		||||
      loadColourSelectors()
 | 
			
		||||
@@ -95,6 +92,20 @@ function filterRole(role) {
 | 
			
		||||
  window.location.replace(url);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function updateTabParams(tab) {
 | 
			
		||||
  var search_params = new URLSearchParams(window.location.search)
 | 
			
		||||
 | 
			
		||||
  if (window.location.href.includes("tab=")) {
 | 
			
		||||
    search_params.set("tab", tab)
 | 
			
		||||
  } else {
 | 
			
		||||
    search_params.append("tab", tab)
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  search_params.delete("page")
 | 
			
		||||
 | 
			
		||||
  window.location.search = search_params.toString()
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function loadColourSelectors() {
 | 
			
		||||
  const pickrRegular = new Pickr({
 | 
			
		||||
    el: '#colorinput-regular',
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										57
									
								
								app/assets/javascripts/delete.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										57
									
								
								app/assets/javascripts/delete.js
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,57 @@
 | 
			
		||||
// 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');
 | 
			
		||||
 | 
			
		||||
  // Only run on the admins page.
 | 
			
		||||
  if (controller == "admins" && action == "index") {
 | 
			
		||||
    // show the modal with the correct form action url
 | 
			
		||||
    $(".delete-user").click(function(){
 | 
			
		||||
      $("#delete-confirm").parent().attr("action", $(this).data("path"))
 | 
			
		||||
 | 
			
		||||
      if ($(this).data("delete") == "temp-delete") {
 | 
			
		||||
        $("#perm-delete").hide()
 | 
			
		||||
        $("#delete-warning").show()
 | 
			
		||||
      } else {
 | 
			
		||||
        $("#perm-delete").show()
 | 
			
		||||
        $("#delete-warning").hide()
 | 
			
		||||
      }
 | 
			
		||||
    })
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  $(".delete-user").click(function(data){
 | 
			
		||||
    document.getElementById("delete-checkbox").checked = false
 | 
			
		||||
    $("#delete-confirm").prop("disabled", "disabled")
 | 
			
		||||
 | 
			
		||||
    if ($(data.target).data("delete") == "temp-delete") {
 | 
			
		||||
      $("#perm-delete").hide()
 | 
			
		||||
      $("#delete-warning").show()
 | 
			
		||||
    } else {
 | 
			
		||||
      $("#perm-delete").show()
 | 
			
		||||
      $("#delete-warning").hide()
 | 
			
		||||
    }
 | 
			
		||||
  })
 | 
			
		||||
 | 
			
		||||
  $("#delete-checkbox").click(function(data){
 | 
			
		||||
    if (document.getElementById("delete-checkbox").checked) {
 | 
			
		||||
      $("#delete-confirm").removeAttr("disabled")
 | 
			
		||||
    } else {
 | 
			
		||||
      $("#delete-confirm").prop("disabled", "disabled")
 | 
			
		||||
    }
 | 
			
		||||
  })
 | 
			
		||||
})
 | 
			
		||||
@@ -69,10 +69,12 @@ function searchPage() {
 | 
			
		||||
 | 
			
		||||
  // Check if the user filtered by role
 | 
			
		||||
  var role = new URL(location.href).searchParams.get('role')
 | 
			
		||||
  var tab = new URL(location.href).searchParams.get('tab')
 | 
			
		||||
 | 
			
		||||
  var url = window.location.pathname + "?page=1&search=" + search
 | 
			
		||||
 | 
			
		||||
  if (role) { url += "&role=" + role } 
 | 
			
		||||
  if (tab) { url += "&tab=" + tab } 
 | 
			
		||||
 | 
			
		||||
  window.location.replace(addRecordingTable(url));
 | 
			
		||||
}
 | 
			
		||||
@@ -80,12 +82,16 @@ function searchPage() {
 | 
			
		||||
// Clears the search bar
 | 
			
		||||
function clearSearch() {
 | 
			
		||||
  var role = new URL(location.href).searchParams.get('role')
 | 
			
		||||
  var tab = new URL(location.href).searchParams.get('tab')
 | 
			
		||||
 | 
			
		||||
  var url = window.location.pathname + "?page=1"
 | 
			
		||||
 | 
			
		||||
  if (role) { url += "&role=" + role } 
 | 
			
		||||
  if (tab) { url += "&tab=" + tab } 
 | 
			
		||||
  
 | 
			
		||||
  window.location.replace(addRecordingTable(url));
 | 
			
		||||
 | 
			
		||||
  var search_params = new URLSearchParams(window.location.search)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
function addRecordingTable(url) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user