GRN2-202: Create a room in which everyone joins as Moderator (Fixed #628) (#650)

* Room setting to allow anyone to start a room * Update sample.env * merge v2.2.1
2019-07-23 14:54:46 -04:00
parent b23f94dfb5
commit d3a9ae32a9
7 changed files with 54 additions and 13 deletions
--- a/app/views/rooms/join.html.erb
+++ b/app/views/rooms/join.html.erb
@ -40,7 +40,7 @@
            placeholder: t("enter_your_name"),
            value: "#{@name}",
            readonly: !current_user.nil? %>
-        <%= f.submit t("room.join"), class: "btn btn-primary btn-sm col-sm-3 form-control join-form" %>
+        <%= f.submit (!@is_running && @anyone_can_start)? t("room.start") : t("room.join"), class: "btn btn-primary btn-sm col-sm-3 form-control join-form" %>
      </div>
    <% end %>
  <% end %>