Merge v2.6-alpha (#1672)

* GRN2-xx: Switch the relation between users and roles to make queries cleaner and faster (#1299) * First steps * Fixes in account creation flow * Fixed most testcases * more test fixes * Fixed more test cases * Passing tests and rubocop * Added rake task to remove rooms * Adding translation (#1510) * Update _account.html.erb * Update en.yml * Fix "for" attribute for label elements (#1488) Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com> * Fix some issues reported by LGTM (#1478) * Declare local JavaScript variables (reported by LGTM) Signed-off-by: Stefan Weil <sw@weilnetz.de> * Remove unused local JavaScript variable (reported by LGTM) Signed-off-by: Stefan Weil <sw@weilnetz.de> * Puma Worker Configuration (#1332) We noticed that the current default settings perform very poorly under load. We managed to literally take down Greenlight during a larger event when people where accessing the landing page for rooms and when doing some tests, I was more or less able to DoS Greenlight on my own. This patch adds a default worker configuration which significantly improves the situation. The small, 4 core machine I was testing on could handle about thrice the amount of requests. While the new default configuration should be reasonably well suited for most deployments, this patch further allows users to easily configure the worker pool on their own in the environment file. * Made name and email readonly for no greenlight accounts (#1534) * Fixed hardcoded string (#1532) * fixed spelling error that was bugging me :) - sep a rat e (#1535) Co-authored-by: Dave Lane <dave@oerfoundation.org> * Improve Server Rooms View (#1524) * Order rooms by status * Cleaned up order function * Now displays Started/Created/Ended * Added participant count to rooms list * Fix rake task user:create so that users can be created when terms are present (#1565) * Changed user create task to always accept terms * clean up * More secure room ID (#1451) * Legal and privpolicy link (#1421) * add customizable Links to Imprint and Privacy Policy * fix copy&paste error in spec * replace "imprint" with "legal" since that is the correct term * remove german translation of new strings, transifex will take care of them later * GRN2-295:Refactored update profile and update password (#1591) * Refactored update profile and update password * Relowered rubocop settings * Fixed email sending when not supposed to (#1592) * Design changes for small screens (#1580) * now rap for pagination * Update _subtitle.html.erb * Update _rooms.html.erb * Update _recordings.html.erb * Update _rooms.html.erb * Update _users.html.erb * Update cant_create_rooms.html.erb * Update room.js * Update edit.html.erb * Update new.html.erb * Update cant_create_rooms.html.erb * Update _sessions.html.erb * Update _account.html.erb * Make Greenlight work with Ruby 2.7 (#1560) Greenlight's failure to start up with Ruby 2.7 seems to be caused by [an issue in bootsnap](https://github.com/Shopify/bootsnap/issues/258). Updating that library makes Greenlight work again. However, there are still a lot of deprecation warnings. But that's something to deal with separately. This fixes #1558 * use email input for sign in (#1199) * use email input for sign in * use email input for registration * use email input for invitation * use email input for account settings Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com> * Fix Gemfile (#1593) * Fixed invalid token for password reset (#1632) * HELP_URL env variable now works as expected (#1636) * #1372 Fix for long Text in Table + Remove invalid HTML Tag (#1403) * removed invalid HTML Tag * removed invalid HTML Tag * Update _public_recording_row.html.erb * Update _recording_row.html.erb * Update _server_recording_row.html.erb form-inline replaced by own css * Update _server_room_row.html.erb * Update _public_recording_row.html.erb * Update _recording_row.html.erb * Update _public_recording_row.html.erb * Update _recordings.html.erb * Update _rooms.html.erb * Update main.scss fix for long text * Update main.scss * Update _public_recording_row.html.erb * Added more validation on profile image (#1644) * Users who can't create rooms but have shared rooms now have a different view (#1649) * Revert "Puma Worker Configuration (#1332)" (#1667) This reverts commit 78ed8d74601b613af3fd96ccf75a6bada24deddd. * Removed html safe from all flash messages (#1668) * Remove hardcoded guest=true if require mod approval is set (#1669) * Change random generation for room uid (#1670) * GRN2-290: Update gems and update to Rails 5.2.4.3 (#1671) * Update gems and update to Rails 5.2.4.3 * remove gemfile error Co-authored-by: MrKeksi <mrkeksi@users.noreply.github.com> Co-authored-by: Florian Weber <fnwbr@users.noreply.github.com> Co-authored-by: Stefan Weil <sw@weilnetz.de> Co-authored-by: Lars Kiesow <lkiesow@uos.de> Co-authored-by: Dave Lane <dave@lane.net.nz> Co-authored-by: Dave Lane <dave@oerfoundation.org> Co-authored-by: Henning <hng@users.noreply.github.com> Co-authored-by: Marcel Waldvogel <marcel@waldvogel.family> Co-authored-by: Christian Marg <marg@rz.tu-clausthal.de> Co-authored-by: Klaus <klaus@jsxc.org>
3 years ago · 51824ad84b
parent 7411eba8e0
commit 51824ad84b
76 changed files with 893 additions and 725 deletions
--- a/.rubocop.yml
+++ b/.rubocop.yml
@ -73,11 +73,11 @@ Style/RescueStandardError:
  Enabled: false

 # Align the elements of a hash literal if they span more than one line.
-Layout/AlignHash:
+Layout/HashAlignment:
  Enabled: false

 # Align the parameters of a method definition if they span more than one line.
-Layout/AlignParameters:
+Layout/ParameterAlignment:
  Enabled: false

 # Align ends corresponding to defs correctly.
@ -93,7 +93,7 @@ Layout/EmptyLineAfterGuardClause:
  Enabled: false

 # Align the arguments of a method call if they span more than one line.
-Layout/AlignArguments:
+Layout/ArgumentAlignment:
  Enabled: false

 #
@ -120,7 +120,7 @@ Metrics/ClassLength:
  Enabled: false

 # Limit lines to 80 characters.
-Metrics/LineLength:
+Layout/LineLength:
  Max: 130

 # Avoid methods longer than 10 lines of code.
@ -141,5 +141,39 @@ Metrics/CyclomaticComplexity:
  Max: 17

 # Checks for method parameter names that contain capital letters, end in numbers, or do not meet a minimal length.
-Naming/UncommunicativeMethodParamName:
-  Enabled: false
+Naming/MethodParameterName:
+  Enabled: false
+
+Lint/LiteralInInterpolation:
+  Enabled: false
+
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+  
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+  
+Lint/RaiseException:
+  Enabled: true
+  
+Lint/StructNewOverride:
+  Enabled: true
+  
+Style/ExponentialNotation:
+  Enabled: true
+  
+Style/HashEachMethods:
+  Enabled: true
+  
+Style/HashTransformKeys:
+  Enabled: true
+   
+Style/HashTransformValues:
+  Enabled: true
+  
+Style/SlicingWithRange:
+  Enabled: true
+  
--- a/4
+++ b/4
@ -8,7 +8,7 @@ git_source(:github) do |repo_name|
 end

 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.2.3'
+gem 'rails', '~> 5.2.4.3'

 # Use Puma as the app server
 gem 'puma', '~> 3.12'
@ -44,6 +44,8 @@ gem 'bcrypt', '~> 3.1.7'
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', '>= 1.1.0', require: false

+gem 'sprockets', '< 4.0.0'
+
 # Authentication.
 gem 'omniauth'
 gem 'omniauth-twitter'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -9,54 +9,54 @@ GIT
 GEM
  remote: https://rubygems.org/
  specs:
-    action-cable-testing (0.5.0)
+    action-cable-testing (0.6.1)
      actioncable (>= 5.0)
-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
+    actioncable (5.2.4.3)
+      actionpack (= 5.2.4.3)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
+    actionmailer (5.2.4.3)
+      actionpack (= 5.2.4.3)
+      actionview (= 5.2.4.3)
+      activejob (= 5.2.4.3)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 2.0)
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
-      rack (~> 2.0)
+    actionpack (5.2.4.3)
+      actionview (= 5.2.4.3)
+      activesupport (= 5.2.4.3)
+      rack (~> 2.0, >= 2.0.8)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
+    actionview (5.2.4.3)
+      activesupport (= 5.2.4.3)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.3)
-      activesupport (= 5.2.3)
+    activejob (5.2.4.3)
+      activesupport (= 5.2.4.3)
      globalid (>= 0.3.6)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
+    activemodel (5.2.4.3)
+      activesupport (= 5.2.4.3)
+    activerecord (5.2.4.3)
+      activemodel (= 5.2.4.3)
+      activesupport (= 5.2.4.3)
      arel (>= 9.0)
-    activestorage (5.2.3)
-      actionpack (= 5.2.3)
-      activerecord (= 5.2.3)
+    activestorage (5.2.4.3)
+      actionpack (= 5.2.4.3)
+      activerecord (= 5.2.4.3)
      marcel (~> 0.3.1)
-    activesupport (5.2.3)
+    activesupport (5.2.4.3)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 0.7, < 2)
      minitest (~> 5.1)
      tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
    arel (9.0.0)
    ast (2.4.0)
-    autoprefixer-rails (9.6.1)
+    autoprefixer-rails (9.7.6)
      execjs
    bcrypt (3.1.13)
    bigbluebutton-api-ruby (1.7.0)
@ -64,14 +64,14 @@ GEM
    bindex (0.8.1)
    bn-ldap-authentication (0.1.2)
      net-ldap (~> 0)
-    bootsnap (1.4.4)
+    bootsnap (1.4.6)
      msgpack (~> 1.0)
    bootstrap (4.3.1)
      autoprefixer-rails (>= 9.1.0)
      popper_js (>= 1.14.3, < 2)
      sassc-rails (>= 2.0.0)
-    builder (3.2.3)
-    byebug (11.0.1)
+    builder (3.2.4)
+    byebug (11.1.3)
    cancancan (2.3.0)
    coffee-rails (4.2.2)
      coffee-script (>= 2.2.0)
@ -80,7 +80,7 @@ GEM
      coffee-script-source
      execjs
    coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
    coveralls (0.8.23)
      json (>= 1.8, < 3)
      simplecov (~> 0.16.1)
@ -89,46 +89,45 @@ GEM
      tins (~> 1.6)
    crack (0.4.3)
      safe_yaml (~> 1.0.0)
-    crass (1.0.5)
+    crass (1.0.6)
    diff-lcs (1.3)
    docile (1.3.2)
-    dotenv (2.7.4)
-    dotenv-rails (2.7.4)
-      dotenv (= 2.7.4)
+    dotenv (2.7.5)
+    dotenv-rails (2.7.5)
+      dotenv (= 2.7.5)
      railties (>= 3.2, < 6.1)
-    erubi (1.8.0)
+    erubi (1.9.0)
    execjs (2.7.0)
-    factory_bot (5.0.2)
+    factory_bot (5.2.0)
      activesupport (>= 4.2.0)
-    factory_bot_rails (5.0.2)
-      factory_bot (~> 5.0.2)
+    factory_bot_rails (5.2.0)
+      factory_bot (~> 5.2.0)
      railties (>= 4.2.0)
-    faker (1.9.6)
-      i18n (>= 0.7)
-    faraday (0.15.4)
+    faker (2.11.0)
+      i18n (>= 1.6, < 2)
+    faraday (1.0.1)
      multipart-post (>= 1.2, < 3)
-    ffi (1.11.1)
+    ffi (1.12.2)
    font-awesome-sass (5.9.0)
      sassc (>= 1.11)
    globalid (0.4.2)
      activesupport (>= 4.2.0)
-    hashdiff (0.4.0)
-    hashie (3.6.0)
+    hashdiff (1.0.1)
+    hashie (4.1.0)
    hiredis (0.6.3)
    http_accept_language (2.1.1)
-    i18n (1.6.0)
+    i18n (1.8.2)
      concurrent-ruby (~> 1.0)
-    i18n-language-mapping (0.1.1)
-    jaro_winkler (1.5.3)
-    jbuilder (2.9.1)
-      activesupport (>= 4.2.0)
+    i18n-language-mapping (0.1.2)
+    jbuilder (2.10.0)
+      activesupport (>= 5.0.0)
    jquery-rails (4.3.5)
      rails-dom-testing (>= 1, < 3)
      railties (>= 4.2.0)
      thor (>= 0.14, < 2.0)
    jquery-ui-rails (6.0.1)
      railties (>= 3.2.16)
-    json (2.2.0)
+    json (2.3.0)
    jwt (2.2.1)
    listen (3.0.8)
      rb-fsevent (~> 0.9, >= 0.9.4)
@ -138,35 +137,35 @@ GEM
      activesupport (>= 4)
      railties (>= 4)
      request_store (~> 1.0)
-    loofah (2.3.1)
+    loofah (2.5.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
    mail (2.7.1)
      mini_mime (>= 0.1.1)
    marcel (0.3.3)
      mimemagic (~> 0.3.2)
-    method_source (0.9.2)
-    mimemagic (0.3.3)
+    method_source (1.0.0)
+    mimemagic (0.3.5)
    mini_mime (1.0.2)
    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    msgpack (1.3.0)
-    multi_json (1.13.1)
+    minitest (5.14.1)
+    msgpack (1.3.3)
+    multi_json (1.14.1)
    multi_xml (0.6.0)
    multipart-post (2.1.1)
-    net-ldap (0.16.1)
-    nio4r (2.4.0)
+    net-ldap (0.16.2)
+    nio4r (2.5.2)
    nokogiri (1.10.9)
      mini_portile2 (~> 2.4.0)
    oauth (0.5.4)
-    oauth2 (1.4.1)
-      faraday (>= 0.8, < 0.16.0)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
      jwt (>= 1.0, < 3.0)
      multi_json (~> 1.3)
      multi_xml (~> 0.5)
      rack (>= 1.2, < 3)
-    omniauth (1.9.0)
-      hashie (>= 3.4.6, < 3.7.0)
+    omniauth (1.9.1)
+      hashie (>= 3.4.6)
      rack (>= 1.6.2, < 3)
    omniauth-bn-launcher (0.1.3)
      omniauth (~> 1.3, >= 1.3.2)
@ -187,29 +186,29 @@ GEM
    omniauth-twitter (1.4.0)
      omniauth-oauth (~> 1.1)
      rack
-    pagy (3.3.2)
-    parallel (1.17.0)
-    parser (2.6.3.0)
+    pagy (3.8.1)
+    parallel (1.19.1)
+    parser (2.7.1.3)
      ast (~> 2.4.0)
    pg (0.21.0)
-    popper_js (1.14.5)
-    public_suffix (3.1.1)
-    puma (3.12.4)
+    popper_js (1.16.0)
+    public_suffix (4.0.5)
+    puma (3.12.6)
    rack (2.2.2)
    rack-test (1.1.0)
      rack (>= 1.0, < 3)
-    rails (5.2.3)
-      actioncable (= 5.2.3)
-      actionmailer (= 5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      activemodel (= 5.2.3)
-      activerecord (= 5.2.3)
-      activestorage (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails (5.2.4.3)
+      actioncable (= 5.2.4.3)
+      actionmailer (= 5.2.4.3)
+      actionpack (= 5.2.4.3)
+      actionview (= 5.2.4.3)
+      activejob (= 5.2.4.3)
+      activemodel (= 5.2.4.3)
+      activerecord (= 5.2.4.3)
+      activestorage (= 5.2.4.3)
+      activesupport (= 5.2.4.3)
      bundler (>= 1.3.0)
-      railties (= 5.2.3)
+      railties (= 5.2.4.3)
      sprockets-rails (>= 2.0.0)
    rails-controller-testing (1.0.4)
      actionpack (>= 5.0.1.x)
@ -218,64 +217,67 @@ GEM
    rails-dom-testing (2.0.3)
      activesupport (>= 4.2.0)
      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (5.2.4.3)
+      actionpack (= 5.2.4.3)
+      activesupport (= 5.2.4.3)
      method_source
      rake (>= 0.8.7)
      thor (>= 0.19.0, < 2.0)
    rainbow (3.0.0)
    rake (13.0.1)
    random_password (0.1.1)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
      ffi (~> 1.0)
-    recaptcha (5.0.0)
+    recaptcha (5.5.0)
      json
-    redcarpet (3.4.0)
-    redis (4.1.2)
+    redcarpet (3.5.0)
+    redis (4.1.4)
    remote_syslog_logger (1.0.4)
      syslog_protocol
-    request_store (1.4.1)
+    request_store (1.5.0)
      rack (>= 1.4)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rexml (3.2.4)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-rails (3.8.2)
+      rspec-support (~> 3.9.0)
+    rspec-rails (3.9.1)
      actionpack (>= 3.0)
      activesupport (>= 3.0)
      railties (>= 3.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.72.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    rubocop (0.84.0)
      parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
      rainbow (>= 2.2.2, < 4.0)
+      rexml
+      rubocop-ast (>= 0.0.3)
      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.0.3)
+      parser (>= 2.7.0.1)
    ruby-progressbar (1.10.1)
    safe_yaml (1.0.5)
-    sassc (2.0.1)
+    sassc (2.3.0)
      ffi (~> 1.9)
-      rake
    sassc-rails (2.1.2)
      railties (>= 4.0.0)
      sassc (>= 2.0)
      sprockets (> 3.0)
      sprockets-rails
      tilt
-    sequel (5.29.0)
+    sequel (5.32.0)
    shoulda-matchers (3.1.3)
      activesupport (>= 4.0.0)
    simplecov (0.16.1)
@ -295,33 +297,35 @@ GEM
      activesupport (>= 4.0)
      sprockets (>= 3.0.0)
    sqlite3 (1.3.13)
+    sync (0.5.0)
    syslog_protocol (0.9.2)
    term-ansicolor (1.7.1)
      tins (~> 1.0)
-    thor (0.20.3)
+    thor (1.0.1)
    thread_safe (0.3.6)
-    tilt (2.0.9)
-    tins (1.21.0)
-    turbolinks (5.2.0)
+    tilt (2.0.10)
+    tins (1.25.0)
+      sync
+    turbolinks (5.2.1)
      turbolinks-source (~> 5.2)
    turbolinks-source (5.2.0)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
      thread_safe (~> 0.1)
-    tzinfo-data (1.2019.3)
+    tzinfo-data (1.2020.1)
      tzinfo (>= 1.0.0)
-    uglifier (4.1.20)
+    uglifier (4.2.0)
      execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.7.0)
    web-console (3.7.0)
      actionview (>= 5.0)
      activemodel (>= 5.0)
      bindex (>= 0.4.0)
      railties (>= 5.0)
-    webmock (3.6.0)
+    webmock (3.8.3)
      addressable (>= 2.3.6)
      crack (>= 0.3.2)
      hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.7.1)
+    websocket-driver (0.7.2)
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.4)
    xml-simple (1.1.5)
@ -361,7 +365,7 @@ DEPENDENCIES
  pagy
  pg (~> 0.18)
  puma (~> 3.12)
-  rails (~> 5.2.3)
+  rails (~> 5.2.4.3)
  rails-controller-testing
  random_password
  recaptcha
@ -375,6 +379,7 @@ DEPENDENCIES
  shoulda-matchers (~> 3.1)
  spring
  spring-watcher-listen (~> 2.0.0)
+  sprockets (< 4.0.0)
  sqlite3 (~> 1.3.6)
  tabler-rubygem!
  turbolinks (~> 5)
--- a/app/assets/javascripts/admins.js
+++ b/app/assets/javascripts/admins.js
@ -80,7 +80,7 @@ $(document).on('turbolinks:load', function(){
        // Get the uid of the selected user
        let user = $(".selectpicker").selectpicker('val')
        if (user != "") {
-          userInfo = JSON.parse(user)
+          let userInfo = JSON.parse(user)
          $("#merge-from").html("<span>" + userInfo.name + "</span>" + "<span class='text-muted d-block'>" + userInfo.email + "</span>" + "<span id='from-uid' class='text-muted d-block'>" + userInfo.uid + "</span>")
        }
      })
@ -95,7 +95,7 @@ $(document).on('turbolinks:load', function(){
      })

      // Updates the colour picker to the correct colour
-      role_colour = $("#role-colorinput-regular").data("colour")
+      let role_colour = $("#role-colorinput-regular").data("colour")
      $("#role-colorinput-regular").css("background-color", role_colour);
      $("#role-colorinput-regular").css("border-color", role_colour);

@ -122,6 +122,18 @@ function changeBrandingImage(path) {
  $.post(path, {value: url})
 }

+// Change the Legal URL to the one provided
+function changeLegalURL(path) {
+  var url = $("#legal-url").val()
+  $.post(path, {value: url})
+}
+
+// Change the Privacy Policy URL to the one provided
+function changePrivacyPolicyURL(path) {
+  var url = $("#privpolicy-url").val()
+  $.post(path, {value: url})
+}
+
 function mergeUsers() {
  let userToMerge = $("#from-uid").text()
  $.post($("#merge-save-access").data("path"), {merge: userToMerge})
@ -263,4 +275,4 @@ function loadRoleColourSelector(role_colour, disabled) {
      $("#role-colour").val(color.toHEXA().toString());
    });
  }
-}
+}
--- a/app/assets/javascripts/room.js
+++ b/app/assets/javascripts/room.js
@ -44,11 +44,6 @@ $(document).on('turbolinks:load', function(){
      }
    });

-    // Forces the wrapper to take the entire screen height if the user can't create rooms
-    if ($("#cant-create-room-wrapper").length){
-      $(".wrapper").css('height', '100%').css('height', '-=130px');
-    }
-
    // Display and update all fields related to creating a room in the createRoomModal
    $("#create-room-block").click(function(){
      showCreateRoom(this)
@ -138,7 +133,6 @@ $(document).on('turbolinks:load', function(){
 });

 function showCreateRoom(target) {
-  var modal = $(target)
  $("#create-room-name").val("")
  $("#create-room-access-code").text(getLocalizedString("modal.create_room.access_code_placeholder"))
  $("#room_access_code").val(null)
@ -269,4 +263,4 @@ function removeSharedUser(target) {
    parentLI.removeChild(target)
    parentLI.classList.add("remove-shared")
  }
-}
+}
--- a/app/assets/javascripts/user_edit.js
+++ b/app/assets/javascripts/user_edit.js
@ -18,61 +18,19 @@ $(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")) {
-    // 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 user-role-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)
-      }
+    // Hack to make it play nice with turbolinks
+    if ($("#role-dropdown:visible").length == 0){
+      $(window).trigger('load.bs.select.data-api')
+    }
+
+    // Check to see if the role dropdown was set up
+    if ($("#role-dropdown").length != 0){
+      $("#role-dropdown").selectpicker('val', $("#user_role_id").val())
+    }
+
+    // Update hidden field with new value
+    $("#role-dropdown").on("changed.bs.select", function(){
+      $("#user_role_id").val($("#role-dropdown").selectpicker('val'))
    })
  }
-})
-
-// 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)
-}
+})
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@ -158,3 +158,10 @@
 .signin-button {
  font-size: 16px;
 }
+
+.table-responsive tbody td:first-child > *:first-child {
+  max-height: 3em;
+  overflow: hidden;
+  max-width: 200px;
+  display: flex;
+}
--- a/app/controllers/admins_controller.rb
+++ b/app/controllers/admins_controller.rb
@ -63,10 +63,16 @@ class AdminsController < ApplicationController
  # GET /admins/rooms
  def server_rooms
    @search = params[:search] || ""
-    @order_column = params[:column] && params[:direction] != "none" ? params[:column] : "created_at"
+    @order_column = params[:column] && params[:direction] != "none" ? params[:column] : "status"
    @order_direction = params[:direction] && params[:direction] != "none" ? params[:direction] : "DESC"

-    @running_room_bbb_ids = all_running_meetings[:meetings].pluck(:meetingID)
+    meetings = all_running_meetings[:meetings]
+    @running_room_bbb_ids = meetings.pluck(:meetingID)
+
+    @participants_count = {}
+    meetings.each do |meet|
+      @participants_count[meet[:meetingID]] = meet[:participantCount]
+    end

    @user_list = shared_user_list if shared_access_allowed

@ -86,23 +92,21 @@ class AdminsController < ApplicationController

  # POST /admins/ban/:user_uid
  def ban_user
-    @user.roles = []
-    @user.add_role :denied
+    @user.set_role :denied

    redirect_back fallback_location: admins_path, flash: { success: I18n.t("administrator.flash.banned") }
  end

  # POST /admins/unban/:user_uid
  def unban_user
-    @user.remove_role :denied
-    @user.add_role :user
+    @user.set_role :user

    redirect_back fallback_location: admins_path, flash: { success: I18n.t("administrator.flash.unbanned") }
  end

  # POST /admins/approve/:user_uid
  def approve
-    @user.remove_role :pending
+    @user.set_role :user

    send_user_approved_email(@user)

@ -298,7 +302,7 @@ class AdminsController < ApplicationController
      flash[:alert] = I18n.t("administrator.roles.role_has_users", user_count: role.users.count)
      return redirect_to admin_roles_path(selected_role: role.id)
    elsif Role::RESERVED_ROLE_NAMES.include?(role) || role.provider != @user_domain ||
-          role.priority <= current_user.highest_priority_role.priority
+          role.priority <= current_user.role.priority
      return redirect_to admin_roles_path(selected_role: role.id)
    else
      role.role_permissions.delete_all
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -27,7 +27,7 @@ class ApplicationController < ActionController::Base

  # Retrieves the current user.
  def current_user
-    @current_user ||= User.includes(:roles, :main_room).find_by(id: session[:user_id])
+    @current_user ||= User.includes(:role, :main_room).find_by(id: session[:user_id])

    if Rails.configuration.loadbalanced_configuration
      if @current_user && !@current_user.has_role?(:super_admin) &&
@ -119,7 +119,7 @@ class ApplicationController < ActionController::Base
       current_user&.greenlight_account? && current_user&.authenticate(Rails.configuration.admin_password_default)

      flash.now[:alert] = I18n.t("default_admin",
-        edit_link: edit_user_path(user_uid: current_user.uid) + "?setting=password").html_safe
+        edit_link: change_password_path(user_uid: current_user.uid)).html_safe
    end
  end

--- a/app/controllers/concerns/authenticator.rb
+++ b/app/controllers/concerns/authenticator.rb
@ -46,8 +46,10 @@ module Authenticator
                          internal_error_url, not_found_url]
      url = if cookies[:return_to] && !dont_redirect_to.include?(cookies[:return_to])
        cookies[:return_to]
-      else
+      elsif user.role.get_permission("can_create_rooms")
        user.main_room
+      else
+        cant_create_rooms_path
      end

      # Delete the cookie if it exists
--- a/app/controllers/concerns/bbb_server.rb
+++ b/app/controllers/concerns/bbb_server.rb
@ -54,7 +54,6 @@ module BbbServer
    join_opts = {}
    join_opts[:userID] = uid if uid
    join_opts[:join_via_html5] = true
-    join_opts[:guest] = true if options[:require_moderator_approval] && !options[:user_is_moderator]

    bbb_server.join_meeting_url(room.bbb_id, name, password, join_opts)
  end
--- a/app/controllers/concerns/emailer.rb
+++ b/app/controllers/concerns/emailer.rb
@ -99,7 +99,6 @@ module Emailer
  def send_approval_user_signup_email(user)
    begin
      return unless Rails.configuration.enable_email_verification
-
      admin_emails = admin_emails()
      UserMailer.approval_user_signup(user, admins_url(tab: "pending"),
      admin_emails, @settings).deliver_now unless admin_emails.empty?
@ -129,12 +128,12 @@ module Emailer
  end

  def admin_emails
-    admins = User.all_users_with_roles.where(roles: { role_permissions: { name: "can_manage_users", value: "true" } })
+    roles = Role.where(provider: @user_domain, role_permissions: { name: "can_manage_users", value: "true" })
+                .pluck(:name)

-    if Rails.configuration.loadbalanced_configuration
-      admins = admins.without_role(:super_admin)
-                     .where(provider: @user_domain)
-    end
+    admins = User.with_role(roles - ["super_admin"])
+
+    admins = admins.where(provider: @user_domain) if Rails.configuration.loadbalanced_configuration

    admins.collect(&:email).join(",")
  end
--- a/app/controllers/concerns/populator.rb
+++ b/app/controllers/concerns/populator.rb
@ -25,29 +25,22 @@ module Populator

    initial_user = case @tab
      when "active"
-        User.includes(:roles).without_role(:pending).without_role(:denied)
+        User.without_role([:pending, :denied])
      when "deleted"
-        User.includes(:roles).deleted
+        User.deleted
      else
-        User.includes(:roles)
+        User.all
    end

    current_role = Role.find_by(name: @tab, provider: @user_domain) if @tab == "pending" || @tab == "denied"

-    initial_list = if current_user.has_role? :super_admin
-      initial_user.where.not(id: current_user.id)
-    else
-      initial_user.without_role(:super_admin).where.not(id: current_user.id)
-    end
+    initial_list = initial_user.without_role(:super_admin) unless current_user.has_role? :super_admin

-    if Rails.configuration.loadbalanced_configuration
-      initial_list.where(provider: @user_domain)
-                  .admins_search(@search, current_role)
-                  .admins_order(@order_column, @order_direction)
-    else
-      initial_list.admins_search(@search, current_role)
-                  .admins_order(@order_column, @order_direction)
-    end
+    initial_list = initial_list.where(provider: @user_domain) if Rails.configuration.loadbalanced_configuration
+
+    initial_list.where.not(id: current_user.id)
+                .admins_search(@search, current_role)
+                .admins_order(@order_column, @order_direction)
  end

  # Returns a list of rooms that are in the same context of the current user
@ -55,9 +48,9 @@ module Populator
    if Rails.configuration.loadbalanced_configuration
      Room.includes(:owner).where(users: { provider: @user_domain })
          .admins_search(@search)
-          .admins_order(@order_column, @order_direction)
+          .admins_order(@order_column, @order_direction, @running_room_bbb_ids)
    else
-      Room.includes(:owner).all.admins_search(@search).admins_order(@order_column, @order_direction)
+      Room.includes(:owner).admins_search(@search).admins_order(@order_column, @order_direction, @running_room_bbb_ids)
    end
  end

@ -77,10 +70,7 @@ module Populator
      roles_can_appear << role.name if role.get_permission("can_appear_in_share_list") && role.priority >= 0
    end

-    initial_list = User.where.not(uid: current_user.uid)
-                       .without_role(:pending)
-                       .without_role(:denied)
-                       .with_highest_priority_role(roles_can_appear)
+    initial_list = User.where.not(uid: current_user.uid).with_role(roles_can_appear)

    return initial_list unless Rails.configuration.loadbalanced_configuration
    initial_list.where(provider: @user_domain)
@ -88,7 +78,7 @@ module Populator

  # Returns a list of users that can merged into another user
  def merge_user_list
-    initial_list = User.where.not(uid: current_user.uid).without_role(:super_admin)
+    initial_list = User.without_role(:super_admin).where.not(uid: current_user.uid)

    return initial_list unless Rails.configuration.loadbalanced_configuration
    initial_list.where(provider: @user_domain)
--- a/app/controllers/concerns/rolify.rb
+++ b/app/controllers/concerns/rolify.rb
@ -46,60 +46,23 @@ module Rolify
  end

  # Updates a user's roles
-  def update_roles(roles)
-    # Check that the user can manage users
-    return true unless current_user.highest_priority_role.get_permission("can_manage_users")
+  def update_roles(role_id)
+    return true if role_id.blank?
+    # Check to make sure user can edit roles
+    return false unless current_user.role.get_permission("can_manage_users")

-    new_roles = roles.split(' ').map(&:to_i)
-    old_roles = @user.roles.pluck(:id).uniq
+    return true if @user.role_id == role_id.to_i

-    added_role_ids = new_roles - old_roles
-    removed_role_ids = old_roles - new_roles
+    new_role = Role.find_by(id: role_id, provider: @user_domain)
+    # Return false if new role doesn't exist
+    return false if new_role.nil?

-    added_roles = []
-    removed_roles = []
-    current_user_role = current_user.highest_priority_role
-
-    # Check that the user has the permissions to add all the new roles
-    added_role_ids.each do |id|
-      role = Role.find(id)
-
-      # Admins are able to add the admin role to other users. All other roles may only
-      # add roles with a higher priority
-      if (role.priority > current_user_role.priority || current_user_role.name == "admin") &&
-         role.provider == @user_domain
-        added_roles << role
-      else
-        return false
-      end
-    end
-
-    # Check that the user has the permissions to remove all the deleted roles
-    removed_role_ids.each do |id|
-      role = Role.find(id)
-
-      # Admins are able to remove the admin role from other users. All other roles may only
-      # remove roles with a higher priority
-      if (role.priority > current_user_role.priority || current_user_role.name == "admin") &&
-         role.provider == @user_domain
-        removed_roles << role
-      else
-        return false
-      end
-    end
+    return false if new_role.priority < current_user.role.priority

    # Send promoted/demoted emails
-    added_roles.each { |role| send_user_promoted_email(@user, role) if role.get_permission("send_promoted_email") }
-    removed_roles.each { |role| send_user_demoted_email(@user, role) if role.get_permission("send_demoted_email") }
-
-    # Update the roles
-    @user.roles.delete(removed_roles)
-    @user.roles << added_roles
-
-    # Make sure each user always has at least the user role
-    @user.roles = [Role.find_by(name: "user", provider: @user_domain)] if @user.roles.count.zero?
+    send_user_promoted_email(@user, new_role) if new_role.get_permission("send_promoted_email")

-    @user.save!
+    @user.update_attribute(:role_id, role_id)
  end

  # Updates a roles priority
@ -107,7 +70,7 @@ module Rolify
    user_role = Role.find_by(name: "user", provider: @user_domain)
    admin_role = Role.find_by(name: "admin", provider: @user_domain)

-    current_user_role = current_user.highest_priority_role
+    current_user_role = current_user.role

    # Users aren't allowed to update the priority of the admin or user roles
    return false if role_to_update.include?(user_role.id.to_s) || role_to_update.include?(admin_role.id.to_s)
@ -149,7 +112,7 @@ module Rolify

  # Update Permissions
  def update_permissions(role)
-    current_user_role = current_user.highest_priority_role
+    current_user_role = current_user.role

    # Checks that it is valid for the provider to update the role
    return false if role.priority <= current_user_role.priority || role.provider != @user_domain
--- a/app/controllers/password_resets_controller.rb
+++ b/app/controllers/password_resets_controller.rb
@ -67,6 +67,8 @@ class PasswordResetsController < ApplicationController

  def find_user
    @user = User.find_by(reset_digest: User.hash_token(params[:id]), provider: @user_domain)
+
+    return redirect_to new_password_reset_url, alert: I18n.t("reset_password.invalid_token") unless @user
  end

  def user_params
--- a/app/controllers/recordings_controller.rb
+++ b/app/controllers/recordings_controller.rb
@ -57,8 +57,6 @@ class RecordingsController < ApplicationController

  # Ensure the user is logged into the room they are accessing.
  def verify_room_ownership
-    if !@room.owned_by?(current_user) && !current_user&.highest_priority_role&.get_permission("can_manage_rooms_recordings")
-      redirect_to root_path
-    end
+    redirect_to root_path if !@room.owned_by?(current_user) && !current_user&.role&.get_permission("can_manage_rooms_recordings")
  end
 end
--- a/app/controllers/rooms_controller.rb
+++ b/app/controllers/rooms_controller.rb
@ -25,7 +25,7 @@ class RoomsController < ApplicationController
  before_action :validate_accepted_terms, unless: -> { !Rails.configuration.terms }
  before_action :validate_verified_email, except: [:show, :join],
                unless: -> { !Rails.configuration.enable_email_verification }
-  before_action :find_room, except: [:create, :join_specific_room]
+  before_action :find_room, except: [:create, :join_specific_room, :cant_create_rooms]
  before_action :verify_room_ownership_or_admin_or_shared, only: [:start, :shared_access]
  before_action :verify_room_ownership_or_admin, only: [:update_settings, :destroy]
  before_action :verify_room_ownership_or_shared, only: [:remove_shared_access]
@ -69,19 +69,13 @@ class RoomsController < ApplicationController

    # If its the current user's room
    if current_user && (@room.owned_by?(current_user) || @shared_room)
-      if current_user.highest_priority_role.get_permission("can_create_rooms")
-        # User is allowed to have rooms
-        @search, @order_column, @order_direction, recs =
-          recordings(@room.bbb_id, params.permit(:search, :column, :direction), true)
-
-        @user_list = shared_user_list if shared_access_allowed
-
-        @pagy, @recordings = pagy_array(recs)
-      else
-        # Render view for users that cant create rooms
-        @recent_rooms = Room.where(id: cookies.encrypted["#{current_user.uid}_recently_joined_rooms"])
-        render :cant_create_rooms
-      end
+      # User is allowed to have rooms
+      @search, @order_column, @order_direction, recs =
+        recordings(@room.bbb_id, params.permit(:search, :column, :direction), true)
+
+      @user_list = shared_user_list if shared_access_allowed
+
+      @pagy, @recordings = pagy_array(recs)
    else
      return redirect_to root_path, flash: { alert: I18n.t("room.invalid_provider") } if incorrect_user_domain

@ -89,6 +83,19 @@ class RoomsController < ApplicationController
    end
  end

+  # GET /rooms
+  def cant_create_rooms
+    shared_rooms = current_user.shared_rooms
+
+    if current_user.shared_rooms.empty?
+      # Render view for users that cant create rooms
+      @recent_rooms = Room.where(id: cookies.encrypted["#{current_user.uid}_recently_joined_rooms"])
+      render :cant_create_rooms
+    else
+      redirect_to shared_rooms[0]
+    end
+  end
+
  # POST /:room_uid
  def join
    return redirect_to root_path,
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@ -39,7 +39,7 @@ class SessionsController < ApplicationController
        "#{Rails.configuration.relative_url_root}/auth/#{@providers.first}"
      end

-      return redirect_to provider_path
+      redirect_to provider_path
    end
  end

@ -94,7 +94,7 @@ class SessionsController < ApplicationController
    login(user)
  end

-  # GET /users/logout
+  # POST /users/logout
  def destroy
    logout
    redirect_to root_path
@ -218,7 +218,7 @@ class SessionsController < ApplicationController

    # Add pending role if approval method and is a new user
    if approval_registration && !@user_exists
-      user.add_role :pending
+      user.set_role :pending

      # Inform admins that a user signed up if emails are turned on
      send_approval_user_signup_email(user)
@ -228,6 +228,8 @@ class SessionsController < ApplicationController

    send_invite_user_signup_email(user) if invite_registration && !@user_exists

+    user.set_role :user unless @user_exists
+
    login(user)

    if @auth['provider'] == "twitter"
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -24,7 +24,7 @@ class UsersController < ApplicationController
  include Recorder
  include Rolify

-  before_action :find_user, only: [:edit, :change_password, :delete_account, :update]
+  before_action :find_user, only: [:edit, :change_password, :delete_account, :update, :update_password]
  before_action :ensure_unauthenticated_except_twitter, only: [:create]
  before_action :check_user_signup_allowed, only: [:create]
  before_action :check_admin_of, only: [:edit, :change_password, :delete_account]
@ -47,7 +47,7 @@ class UsersController < ApplicationController

    # Set user to pending and redirect if Approval Registration is set
    if approval_registration
-      @user.add_role :pending
+      @user.set_role :pending

      return redirect_to root_path,
        flash: { success: I18n.t("registration.approval.signup") } unless Rails.configuration.enable_email_verification
@ -56,7 +56,11 @@ class UsersController < ApplicationController
    send_registration_email

    # Sign in automatically if email verification is disabled or if user is already verified.
-    login(@user) && return if !Rails.configuration.enable_email_verification || @user.email_verified
+    if !Rails.configuration.enable_email_verification || @user.email_verified
+      @user.set_role :user
+
+      login(@user) && return
+    end

    send_activation_email(@user, @user.create_activation_token)

@ -77,9 +81,8 @@ class UsersController < ApplicationController
  def delete_account
  end

-  # PATCH /u/:user_uid/edit
+  # POST /u/:user_uid/edit
  def update
-    profile = params[:setting] == "password" ? change_password_path(@user) : edit_user_path(@user)
    if session[:prev_url].present?
      path = session[:prev_url]
      session.delete(:prev_url)
@ -87,44 +90,50 @@ class UsersController < ApplicationController
      path = admins_path
    end

-    redirect_path = current_user.admin_of?(@user, "can_manage_users") ? path : profile
+    redirect_path = current_user.admin_of?(@user, "can_manage_users") ? path : edit_user_path(@user)

-    if params[:setting] == "password"
-      # Update the users password.
+    unless @user.greenlight_account?
+      params[:user][:name] = @user.name
+      params[:user][:email] = @user.email
+    end

-      if @user.authenticate(user_params[:password])
-        # Verify that the new passwords match.
-        if user_params[:new_password] == user_params[:password_confirmation]
-          @user.password = user_params[:new_password]
-        else
-          # New passwords don't match.
-          @user.errors.add(:password_confirmation, "doesn't match")
-        end
+    if @user.update_attributes(user_params)
+      @user.update_attributes(email_verified: false) if user_params[:email] != @user.email
+
+      user_locale(@user)
+
+      if update_roles(params[:user][:role_id])
+        return redirect_to redirect_path, flash: { success: I18n.t("info_update_success") }
      else
-        # Original password is incorrect, can't update.
-        @user.errors.add(:password, "is incorrect")
+        flash[:alert] = I18n.t("administrator.roles.invalid_assignment")
      end
+    end

-      # Notify the user that their account has been updated.
-      return redirect_to redirect_path,
-        flash: { success: I18n.t("info_update_success") } if @user.errors.empty? && @user.save
+    render :edit
+  end

-      render :change_password
+  # POST /u/:user_uid/change_password
+  def update_password
+    # Update the users password.
+    if @user.authenticate(user_params[:password])
+      # Verify that the new passwords match.
+      if user_params[:new_password] == user_params[:password_confirmation]
+        @user.password = user_params[:new_password]
+      else
+        # New passwords don't match.
+        @user.errors.add(:password_confirmation, "doesn't match")
+      end
    else
-      if @user.update_attributes(user_params)
-        @user.update_attributes(email_verified: false) if user_params[:email] != @user.email
+      # Original password is incorrect, can't update.
+      @user.errors.add(:password, "is incorrect")
+    end

-        user_locale(@user)
+    # Notify the user that their account has been updated.
+    return redirect_to change_password_path,
+      flash: { success: I18n.t("info_update_success") } if @user.errors.empty? && @user.save

-        if update_roles(params[:user][:role_ids])
-          return redirect_to redirect_path, flash: { success: I18n.t("info_update_success") }
-        else
-          flash[:alert] = I18n.t("administrator.roles.invalid_assignment")
-        end
-      end
-
-      render :edit
-    end
+    # redirect_to change_password_path
+    render :change_password
  end

  # DELETE /u/:user_uid
--- a/app/helpers/admins_helper.rb
+++ b/app/helpers/admins_helper.rb
@ -31,6 +31,11 @@ module AdminsHelper
    @running_room_bbb_ids.include?(id)
  end

+  # Returns a more friendly/readable date time object
+  def friendly_time(date)
+    I18n.l date, format: "%B %d, %Y %H:%M UTC"
+  end
+
  # Site Settings

  def admin_invite_registration
@ -110,6 +115,6 @@ module AdminsHelper
  # Roles

  def edit_disabled
-    @edit_disabled ||= @selected_role.priority <= current_user.highest_priority_role.priority
+    @edit_disabled ||= @selected_role.priority <= current_user.role.priority
  end
 end
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -58,7 +58,16 @@ module ApplicationHelper
  # Returns the page that the logo redirects to when clicked on
  def home_page
    return admins_path if current_user.has_role? :super_admin
-    current_user.main_room
+    return current_user.main_room if current_user.role.get_permission("can_create_rooms")
+    cant_create_rooms_path