scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

add user variable

Browse source
This commit is contained in:
Mojca Lorber 2017-06-29 12:56:14 +02:00
parent 21b4ba7627
commit 2ab74c8979
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/views/user_projects/_index.html.erb
View file

@ -4,16 +4,15 @@
<% if @users.size == 0 then %>
<li><em><%= t 'projects.index.no_users' %></em></li>
<% else %>
<% @users.each_with_index do |user_proj, i| %>
<% @users.each_with_index do |user_proj, i| user = user_proj.user %>
<li>
<% if i > 0 %><hr><% end %>
<div class="row">
<div class="col-xs-2">
<%= image_tag avatar_path(user_proj.user, :icon_small), class: 'img-circle pull-left' %>
<%= image_tag avatar_path(user, :icon_small), class: 'img-circle pull-left' %>
</div>
<div class="col-xs-10">
<span><%= user_proj.user.full_name %></span>
<span><%= user.full_name %></span>
<br><span class="text-muted"><%= t('user_projects.enums.role.'<< user_proj.role.to_s) %></span>
</div>
</div>

8
app/views/user_projects/_index_edit.html.erb
View file

@ -3,21 +3,21 @@
<% if @users.size == 0 then %>
<li><em><%= t 'projects.index.modal_manage_users.no_users' %></em></li>
<% else %>
<% @users.each_with_index do |user_proj, i| %>
<% @users.each_with_index do |user_proj, i| user = user_proj.user %>
<li>
<% if i > 0 %><hr><% end %>
<div class="row">
<div class="col-xs-2">
<%= image_tag avatar_path(user_proj.user, :icon_small), class: 'img-circle pull-left' %>
<%= image_tag avatar_path(user, :icon_small), class: 'img-circle pull-left' %>
</div>
<div class="col-xs-10 col-sm-4">
<span><%= user_proj.user.full_name %></span>
<span><%= user.full_name %></span>
<br><span class="text-muted"><%= t('user_projects.enums.role.'<< user_proj.role) %></span>
</div>
<% unless user_proj.user.id == current_user.id %>
<% unless user.id == current_user.id %>
<div class="visible-xs">&nbsp;</div>
<div class="col-xs-7 col-xs-offset-2 col-sm-4 col-sm-offset-0">
<%= form_for @up, url: project_user_project_path(@project, user_proj.id, method: :put, format: :json), format: :json, method: 'put', remote: true, html: { class: 'update-user-form' } do |f| %>