scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-27 02:04:33 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix user smart annotation showing as if the user is removed from team [SCI-2861]

Browse source
This commit is contained in:
Matej Zrimšek 2018-11-19 08:02:25 +01:00
parent c184ca1c95
commit c144d599fc
9 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/my_module_comments/_comment.html.erb
View file

@ -36,5 +36,5 @@
</div>
<strong><%= comment.user.full_name %>:</strong>
<div data-role="comment-message-container">
<div data-role="comment-message"><%= custom_auto_link(comment.message) %></div>
<div data-role="comment-message"><%= custom_auto_link(comment.message, team: current_team) %></div>
</div>

2
app/views/my_modules/_description_label.html.erb
View file

@ -1,5 +1,5 @@
<% if @my_module.description.blank? %>
<em><%=t "experiments.canvas.popups.no_description" %></em>
<% else %>
<%= custom_auto_link(@my_module.description) %>
<%= custom_auto_link(@my_module.description, team: current_team) %>
<% end %>

3
app/views/project_comments/_comment.html.erb
View file

@ -36,5 +36,6 @@
</div>
<strong><%= comment.user.full_name %>:</strong>
<div data-role="comment-message-container">
<div data-role="comment-message"><%= custom_auto_link(comment.message) %></div>
<% byebug %>
<div data-role="comment-message"><%= custom_auto_link(comment.message, team: current_team) %></div>
</div>

2
app/views/projects/experiment_archive/_experiment.html.erb
View file

@ -67,7 +67,7 @@
</div>
<div class="row">
<div class="col-xs-12">
<%= custom_auto_link(experiment.description) %>
<%= custom_auto_link(experiment.description, team: current_team) %>
</div>
</div>
</div>

2
app/views/projects/show/_experiment.html.erb
View file

@ -46,7 +46,7 @@
<div data-hook="experiment-card-body">
<% if experiment.description? %>
<div class='experiment-description'>
<%= custom_auto_link(experiment.description) %>
<%= custom_auto_link(experiment.description, team: current_team) %>
</div>
<% else %>
<span class='experiment-no-description'>

2
app/views/result_comments/_comment.html.erb
View file

@ -37,5 +37,5 @@
<% end %>
</div>
<div data-role="comment-message-container">
<div data-role="comment-message"><%= custom_auto_link(comment.message) %></div>
<div data-role="comment-message"><%= custom_auto_link(comment.message, team: current_team) %></div>
</div>

3
app/views/results/_result_text.html.erb
View file

@ -1,5 +1,6 @@
<div class="ql-editor">
<%= custom_auto_link(generate_image_tag_from_token(result.result_text.text, result.result_text),
simple_format: false,
tags: %w(img)) %>
tags: %w(img),
team: current_team) %>
</div>

2
app/views/step_comments/_comment.html.erb
View file

@ -37,5 +37,5 @@
<% end %>
</div>
<div data-role="comment-message-container">
<div data-role="comment-message"><%= custom_auto_link(comment.message)%></div>
<div data-role="comment-message"><%= custom_auto_link(comment.message, team: current_team)%></div>
</div>

7
app/views/steps/_step.html.erb
View file

@ -55,7 +55,8 @@
<div class="ql-editor">
<%= custom_auto_link(generate_image_tag_from_token(step.description, step),
simple_format: false,
tags: %w(img)) %>
tags: %w(img),
team: current_team) %>
</div>
<% end %>
</div>
@ -95,7 +96,7 @@
<% unless step.checklists.blank? then %>
<div class="col-xs-12">
<% step.checklists.asc.each do |checklist| %>
<strong><%= custom_auto_link(checklist.name) %></strong>
<strong><%= custom_auto_link(checklist.name, team: current_team) %></strong>
<% if checklist.checklist_items.empty? %>
</br>
<%= t("protocols.steps.empty_checklist") %>
@ -114,7 +115,7 @@
value=""
disabled="disabled" />
<% end %>
<%= custom_auto_link(checklist_item.text) %>
<%= custom_auto_link(checklist_item.text, team: current_team) %>
</label>
</div>
<% end %>