scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7232 from artoscinote/ma_SCI_10340

Browse source 
Fix experiment description modal smart annotations [SCI-10340]
This commit is contained in:
Martin Artnik 2024-03-13 13:14:40 +01:00 committed by GitHub
parent 24af54cfaa 741e81ef60
commit 83d806b64f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/vue/experiments/modals/description.vue
View file

@ -10,9 +10,7 @@
{{ experiment.name }}
</h4>
</div>
<div class="modal-body">
{{ experiment.description }}
</div>
<div class="modal-body" v-html="experiment.sa_description"></div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">{{ i18n.t('general.close') }}</button>
</div>

4
app/views/shared/_atwho_user_container.html.erb
View file

@ -15,7 +15,7 @@
data-html="true"
tabindex="0"
data-trigger="manual"
data-placement="top"
data-placement="auto"
data-toggle="popover"
data-content=""
data-full-name="<%= escape_input(user.full_name) %>"
@ -32,4 +32,4 @@
<% unless skip_user_status || user_still_in_team %>
<%= I18n.t('atwho.res.removed') %>
<% end %>
</span>
</span>