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

GRN2-xx: Fixed issue with recording row and added small fix to roles migration (Fixed #717, #718) (#719)

Browse Source 
* Fixed issue with recording row and added small fix to roles migration

* Fixed issue with edit user avatar

* Small bug fixes for user settings

* Added autofocus on name field when joining

* Added extra check for admin password check

* Rubocop fixes
This commit is contained in:
farhatahmad
2019-08-01 16:53:26 -04:00
committed by Jesus Federico
parent 4fc1714db8
commit 60f5cd5c81
7 changed files with 99 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/shared/components/_public_recording_row.html.erb
View File

@ -32,7 +32,7 @@
<td class="overflow-hidden">
<% p = recording[:playbacks].find do |p| p.key?(:preview) end %>
<% if p %>
<% p[:preview][:images][:image].each do |img| %>
<% safe_recording_images(p[:preview][:images][:image]).each do |img| %>
<%= image_tag(img[:content].strip, class: "thumbnail px-2") %>
<% end %>
<% end %>

8
app/views/shared/settings/_account.html.erb
View File

@ -27,7 +27,7 @@
<div class="col-6">
<%= f.label t("email"), class: "form-label" %>
<div class="input-icon">
<%= f.text_field :email, class: "form-control #{form_is_invalid?(@user, :email)}", placeholder: t("email"), readonly: !current_user.greenlight_account? %>
<%= f.text_field :email, class: "form-control #{form_is_invalid?(@user, :email)}", placeholder: t("email"), readonly: !@user.greenlight_account? %>
</div>
</div>
</div>
@ -63,10 +63,10 @@
<%= f.label t("settings.account.image"), class: "form-label mt-5" %>
<div class="row">
<div class="col-2">
<% if current_user.image.blank? %>
<span class="avatar avatar-xxl mr-5 mt-2"><%= current_user.name.first %></span>
<% if @user.image.blank? %>
<span class="avatar avatar-xxl mr-5 mt-2"><%= @user.name.first %></span>
<% else %>
<span class="avatar avatar-xxl mr-5 mt-2" style="background-image: url(<%= current_user.image %>)"></span>
<span class="avatar avatar-xxl mr-5 mt-2" style="background-image: url(<%= @user.image %>)"></span>
<% end %>
</div>
<div class="col-10 mt-5">

6
app/views/shared/settings/_setting_view.html.erb
View File

@ -21,10 +21,6 @@
</div>
</div>
<% unless (defined?(admin_view)).nil? %>
<%= render "shared/admin_settings/#{setting_id}" %>
<% else %>
<%= render "shared/settings/#{setting_id}" %>
<% end %>
<%= render "shared/settings/#{setting_id}" %>
</div>
<% end %>