aboutsummaryrefslogtreecommitdiffstats
path: root/app/inputs
diff options
context:
space:
mode:
authorLuc Donnet2015-01-15 16:40:30 +0100
committerLuc Donnet2015-01-15 16:40:30 +0100
commitc89c3508eb953e79165ba61aee878db8e4d15ff5 (patch)
treef59b362c96c13bd5facba44f356676f3383e6cd3 /app/inputs
parentb9a4d3cde1604f4bea01551d8c85624a313a2dfe (diff)
parent7d984efe77efd8e610c91fcefc35c4a3e17412fd (diff)
downloadchouette-core-c89c3508eb953e79165ba61aee878db8e4d15ff5.tar.bz2
Fix tests and merge master
Diffstat (limited to 'app/inputs')
-rw-r--r--app/inputs/search_time_table_input.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/inputs/search_time_table_input.rb b/app/inputs/search_time_table_input.rb
index 877333592..c64280e6d 100644
--- a/app/inputs/search_time_table_input.rb
+++ b/app/inputs/search_time_table_input.rb
@@ -25,12 +25,11 @@ class SearchTimeTableInput < Formtastic::Inputs::SearchInput
minChars: 2,
propertyToSearch: 'comment',
preventDuplicates: true,
- queryParam: 'q[comment_cont]',
hintText: '#{options[:hint_text]}',
noResultsText: '#{options[:no_result_text]}',
searchingText: '#{options[:searching_text]}',
resultsFormatter: time_table_formatter,
- tokenFormatter: time_table_formatter,
+ tokenFormatter: time_table_formatter,
});
});").html_safe)
end
@@ -49,7 +48,7 @@ class SearchTimeTableInput < Formtastic::Inputs::SearchInput
:required => nil,
:autofocus => nil,
:class => 'token-input',
- 'data-model-name' => object.class.model_name.human
+ 'data-model-name' => object.class.model_name.human
})
end