Merge pull request #6521 from artoscinote/ma_SCI_9583

Smart annotation and text value fixes [SCI-9583]
This commit is contained in:
Martin Artnik 2023-10-24 13:25:58 +02:00 committed by GitHub
commit 7f7ed1ea8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions

View file

@ -46,8 +46,10 @@ export default {
},
mounted() {
this.$nextTick(() => {
const textHeight = this.$refs.textRef.scrollHeight
this.expandable = textHeight > 60 // 60px
if (this.$refs.textRef) {
const textHeight = this.$refs.textRef.scrollHeight
this.expandable = textHeight > 60 // 60px
}
})
},
}

View file

@ -43,7 +43,7 @@ module SmartAnnotations
if object&.repository
repository_name = fetch_repository_name(object)
"<a href='#{ROUTES.repository_repository_row_path(object.repository, object)}' " \
"class='sa-link record-info-link text-sn-science-blue hover:text-sn-science-blue hover:no-underline'><span class='sa-type'>#{trim_repository_name(repository_name)}</span>" \
"class='sa-link record-info-link'><span class='sa-type'>#{trim_repository_name(repository_name)}</span>" \
"#{object.name} #{object.archived? ? I18n.t('atwho.res.archived') : ''}</a>"
else
"<span class='sa-type'>Inv</span> #{name} #{I18n.t('atwho.res.deleted')}"

View file

@ -10,7 +10,7 @@
<% end %>
<a
role="button"
class="atwho-user-popover text-sn-science-blue hover:text-sn-science-blue hover:no-underline"
class="atwho-user-popover"
data-container="body"
data-html="true"
tabindex="0"
@ -32,4 +32,4 @@
<% unless skip_user_status || user_still_in_team %>
<%= I18n.t('atwho.res.removed') %>
<% end %>
</span>
</span>