diff --git a/app/assets/stylesheets/my_modules/results/index.scss b/app/assets/stylesheets/my_modules/results/index.scss index 453c6f13c..6a0584535 100644 --- a/app/assets/stylesheets/my_modules/results/index.scss +++ b/app/assets/stylesheets/my_modules/results/index.scss @@ -98,3 +98,18 @@ } } +.comments-counter { + align-items: center; + background: var(--sn-grey); + border-radius: .5rem; + color: $color-white; + display: flex; + font-size: 10px; + height: 16px; + justify-content: center; + margin: 2px; + min-width: 16px; + position: absolute; + right: 0; + top: 0; +} diff --git a/app/assets/stylesheets/shared/comments_sidebar.scss b/app/assets/stylesheets/shared/comments_sidebar.scss index 49499016a..eca1994b2 100644 --- a/app/assets/stylesheets/shared/comments_sidebar.scss +++ b/app/assets/stylesheets/shared/comments_sidebar.scss @@ -38,6 +38,7 @@ flex-basis: calc(100% - 40px); flex-grow: 1; height: 2em; + max-width: 13em; line-height: 2em; overflow: hidden; text-overflow: ellipsis; diff --git a/app/helpers/comment_helper.rb b/app/helpers/comment_helper.rb index f6a5ae93e..5a3364208 100644 --- a/app/helpers/comment_helper.rb +++ b/app/helpers/comment_helper.rb @@ -40,7 +40,7 @@ module CommentHelper when 'Step' can_create_comments_in_my_module_steps?(object.my_module) when 'Result' - can_create_my_module_result_comments?(object.my_module) + can_create_my_module_result_comments?(object.my_module) && object.active? when 'Project' can_create_project_comments?(object) else diff --git a/app/javascript/vue/results/result.vue b/app/javascript/vue/results/result.vue index 158bd8786..2caa952de 100644 --- a/app/javascript/vue/results/result.vue +++ b/app/javascript/vue/results/result.vue @@ -48,7 +48,12 @@ data-object-type="Result" :data-object-id="result.id"> + + {{ result.attributes.comments_count }} + +