lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes for 2.6 (#1677)

This commit is contained in:
Ahmad Farhat 2020-05-27 14:46:33 -04:00 committed by GitHub
parent 39962c54df
commit d7079e7880
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/admins_controller.rb
View File

@ -67,6 +67,7 @@ class AdminsController < ApplicationController
@order_direction = params[:direction] && params[:direction] != "none" ? params[:direction] : "DESC" @order_direction = params[:direction] && params[:direction] != "none" ? params[:direction] : "DESC"
meetings = all_running_meetings[:meetings] meetings = all_running_meetings[:meetings]
@order_column = "created_at" if meetings.empty?
@running_room_bbb_ids = meetings.pluck(:meetingID) @running_room_bbb_ids = meetings.pluck(:meetingID)
@participants_count = {} @participants_count = {}

17
app/views/shared/_footer.html.erb
View File

@ -14,8 +14,21 @@
%> %>
<footer class="footer pt-3"> <footer class="footer pt-3">
<p class="text-center mb-1"><%= t("footer.powered_by", href: link_to(t("greenlight"), "https://bigbluebutton.org/2018/07/09/greenlight-2-0/", target: "_blank", rel: "noopener")).html_safe %> <%= Greenlight::Application::VERSION %> <p class="text-center mb-1">
<%= link_to( ' | ' + t("footer.legal"), legal_url ) if legal_url.present? %><%= link_to( ' | ' + t("footer.privpolicy"), privpolicy_url) if privpolicy_url.present? %></p> <%= t("footer.powered_by", href: link_to(t("greenlight"), "https://bigbluebutton.org/2018/07/09/greenlight-2-0/", target: "_blank", rel: "noopener")).html_safe %> <%= Greenlight::Application::VERSION %>
<% if legal_url.present? %>
<span>
|
<%= link_to(t("footer.legal"), legal_url) %>
</span>
<% end %>
<% if privpolicy_url.present? %>
<span>
|
<%= link_to(t("footer.privpolicy"), privpolicy_url) %>
</span>
<% end %>
</p>
</footer> </footer>
<%= render "shared/components/cookie_warning" %> <%= render "shared/components/cookie_warning" %>

2
app/views/shared/modals/_invite_user_modal.html.erb
View File

@ -27,7 +27,7 @@
<span class="input-icon-addon"> <span class="input-icon-addon">
<i class="fas fa-envelope"></i> <i class="fas fa-envelope"></i>
</span> </span>
<%= f.email_field :email, class: "form-control", value: "", placeholder: t("modal.invite_user.email_placeholder"), autocomplete: :off %> <%= f.text_field :email, class: "form-control", value: "", placeholder: t("modal.invite_user.email_placeholder"), autocomplete: :off %>
<div class="invalid-feedback text-left"><%= t("modal.invite_user.not_blank") %></div> <div class="invalid-feedback text-left"><%= t("modal.invite_user.not_blank") %></div>
</div> </div>
<div class="mt-4"> <div class="mt-4">

3
config/puma.rb
View File

@ -17,9 +17,6 @@ port ENV.fetch("PORT") { 80 }
# #
environment ENV.fetch("RAILS_ENV") { "development" } environment ENV.fetch("RAILS_ENV") { "development" }
# Specifies the `pidfile` that Puma will use.
pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
# Specifies the number of `workers` to boot in clustered mode. # Specifies the number of `workers` to boot in clustered mode.
# Workers are forked webserver processes. If using threads and workers together # Workers are forked webserver processes. If using threads and workers together
# the concurrency of the application would be max `threads` * `workers`. # the concurrency of the application would be max `threads` * `workers`.