Merge pull request #3043 from okriuchykhin/ok_SCI_5332

Fix projects filter mark, titles and comments mark [SCI-5332]
This commit is contained in:
Miha Mencin 2021-01-06 11:46:01 +01:00 committed by GitHub
commit 38d4a3804c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 2 deletions

View file

@ -543,6 +543,21 @@
});
}
function appliedFiltersMark() {
let filtersEnabled = projectsViewSearch
|| createdOnFromFilter
|| createdOnToFilter
|| (membersFilter && membersFilter.length !== 0)
|| lookInsideFolders
|| archivedOnFromFilter
|| archivedOnToFilter;
if (filtersEnabled) {
$('.filter-container').addClass('filters-applied');
} else {
$('.filter-container').removeClass('filters-applied');
}
}
function initProjectsFilters() {
let $projectsFilter = $('.projects-index .projects-filters');
let $membersFilter = $('.members-filter', $projectsFilter);
@ -645,6 +660,7 @@
archivedOnFromFilter = $archivedOnFromFilter.val();
archivedOnToFilter = $archivedOnToFilter.val();
appliedFiltersMark();
refreshCurrentView();
});

View file

@ -8,7 +8,7 @@
<div class="icon-folder">
<i class="fas fa-folder"></i>
</div>
<div class="name">
<div class="name" title="<%= folder.name %>">
<%= link_to(folder.name,
project_folder_path(folder),
class: 'project-folder-link',

View file

@ -7,7 +7,7 @@
</div>
<div class="project-name-cell">
<a href="<%= project_url(project) %>">
<h3 class="name">
<h3 class="name" title="<%= project.name %>">
<%= project.name %>
</h3>
</a>

View file

@ -2,3 +2,4 @@
<%= render partial: 'shared/comments/comment.html.erb',
locals: { comment: comment } %>
<% end %>
<% comments.mark_as_seen_by(current_user) %>