scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-28 17:54:16 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix bugs on projects page

Browse source
This commit is contained in:
Mojca Lorber 2017-06-28 17:15:09 +02:00
parent b830be3ec6
commit 21b4ba7627
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/application.js.erb
View file

@ -60,7 +60,6 @@ function initFormSubmitLinks(el) {
}
/* Enable loading bars */
Turbolinks.enableProgressBar();
$(document)
.bind("ajaxSend", function(){
animateLoading();

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

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

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

@ -3,26 +3,26 @@
<% if @users.size == 0 then %>
<li><em><%= t 'projects.index.modal_manage_users.no_users' %></em></li>
<% else %>
<% @users.each_index do |i| user = @users[i].user %>
<% @users.each_with_index do |user_proj, i| %>
<li>
<% if i > 0 %><hr><% end %>
<div class="row">
<div class="col-xs-2">
<%= image_tag avatar_path(user, :icon_small), class: 'img-circle pull-left' %>
<%= image_tag avatar_path(user_proj.user, :icon_small), class: 'img-circle pull-left' %>
</div>
<div class="col-xs-10 col-sm-4">
<span><%= user.full_name %></span>
<br><span class="text-muted"><%= t('user_projects.enums.role.'<<@users[i].role) %></span>
<span><%= user_proj.user.full_name %></span>
<br><span class="text-muted"><%= t('user_projects.enums.role.'<< user_proj.role) %></span>
</div>
<% unless user.id == current_user.id %>
<% unless user_proj.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, @users[i].id, method: :put, format: :json), format: :json, method: 'put', remote: true, html: { class: 'update-user-form' } do |f| %>
<%= 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| %>
<% # TODO replace with form helper %>
<input type="hidden" name="user_project[user_id]" value="<%= @users[i].id %>">
<input type="hidden" name="user_project[user_id]" value="<%= user_proj.id %>">
<% # TODO replace hardcoded select html with rails helper %>
<select class="selectpicker" name="user_project[role]">
<option value=""><%= t('user_projects.edit.update_role') %></option>
@ -34,7 +34,7 @@
<% end %>
</div>
<div class="col-xs-3 col-sm-2">
<%= link_to project_user_project_path(@project, @users[i], format: :json), method: :delete, remote: true, class: 'btn btn-link remove-user-link' do %>
<%= link_to project_user_project_path(@project, user_proj, format: :json), method: :delete, remote: true, class: 'btn btn-link remove-user-link' do %>
<span class="glyphicon glyphicon-remove"></span>
<% end %>
</div>