WIP: Cleanup and bug fixes

pull/5981/head
Wieland Lindenthal 7 years ago committed by Jens Ulferts
parent f3f498baa1
commit 22dffad38d
No known key found for this signature in database
GPG Key ID: 3CAA4B1182CF5308
  1. 3
      app/assets/javascripts/project/filters.js
  2. 4
      app/views/projects/index.html.erb

@ -44,6 +44,7 @@ jQuery(function($) {
}
function sendForm() {
$('#ajax-indicator').show();
let $advancedFilters = $(".advanced-filters--filter", $filterForm);
let filters = [];
$advancedFilters.each(function(_i, filter){
@ -73,8 +74,8 @@ jQuery(function($) {
return false;
}
// Register event listeners
$filterForm.submit(sendForm)
$button.click(toggleProjectFilterForm);
$closeIcon.click(toggleProjectFilterForm);
});

@ -82,7 +82,7 @@ See doc/COPYRIGHT.rdoc for more details.
</div>
<div class="advanced-filters--filter-value">
<% unless operators_without_values.include? selected_operator %>
<% if filter.type == :list_optional %>
<% if %i(list list_optional list_all ).include? filter.type %>
<div>
<span class="inline-label">
<%= select_tag :value,
@ -90,7 +90,7 @@ See doc/COPYRIGHT.rdoc for more details.
filter.allowed_values,
:second,
:first,
@query.find_active_filter(name)
@query.find_active_filter(filter.name)
.try(:values)
.try(:first)),
class: 'form--select -small' %>

Loading…
Cancel
Save