Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tag suggestions to show all relevant ones #7338

Merged
merged 16 commits into from
Apr 6, 2020
Merged

Fix tag suggestions to show all relevant ones #7338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1349c62
Fixes #7263 At location button to dashboard sidebar
imajit Jan 16, 2020
989ce9b
Fixes #7263 At location button to dashboard sidebar
imajit Jan 16, 2020
0d84691
Merge branch 'master' of github.com:publiclab/plots2
imajit Jan 16, 2020
ee2b238
Trying new code to fix issue
imajit Jan 17, 2020
6a17e9f
Merge pull request #1 from publiclab/master
imajit Jan 18, 2020
6810e8f
Merge pull request #2 from publiclab/master
imajit Jan 22, 2020
cc4542f
Merge pull request #3 from publiclab/master
imajit Jan 23, 2020
bbb70a8
feature suggests tags in subscriptions
imajit Jan 23, 2020
4cb5019
removed trailing white space
imajit Jan 23, 2020
475531a
changed .each to .select
imajit Jan 23, 2020
abee0bd
changed .each to .select
imajit Jan 23, 2020
2f2e8cf
resolved error
imajit Jan 23, 2020
b6a5108
resolved error
imajit Jan 23, 2020
0c3683f
Test run
imajit Jan 26, 2020
092e32f
Test run
imajit Jan 26, 2020
708ae76
Test run 2
imajit Jan 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/models/tag.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,10 @@ def self.graph_data(limit = 250)
end
end

def self.all_tags_by_popularity
Tag.all.order('count DESC').select { |tag| !(tag.name.include? ":") }.uniq(&:name).pluck(:name)
end

def subscription_graph(start = DateTime.now - 1.year, fin = DateTime.now)
date_hash = {}
week = start.to_date.step(fin.to_date, 7).count
Expand Down
2 changes: 1 addition & 1 deletion app/views/home/subscriptions.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<div class="form-group">
<div class="row">
<div class="col-md-7">
<input type="text" name="name" class="form-control" placeholder="<%= translation('home.subscriptions.enter_tags') %>" data-provide="typeahead" data-source='["balloon-mapping","thermal-flashlight","spectrometer"]' autocomplete="off" required="required">
<input type="text" name="name" class="form-control" placeholder="<%= translation('home.subscriptions.enter_tags') %>" data-provide="typeahead" data-source='<%= Tag.all_tags_by_popularity %>' autocomplete="off" required="required">
</div>
<div class="col-md-2 pl-md-1">
<button type="submit" class="btn btn-primary add-subscriptions"><i class="fa fa-plus fa fa-white"></i> <%= translation('home.subscriptions.add') %></button>
Expand Down