+ <% presenter.saved_search_labels.each do |label| %>
+
- Saved Search: <%= link_to category, posts_path(:tags => "search:#{category}") %>
+ Saved Search: <%= link_to label, posts_path(:tags => "search:#{label}") %>
+ (<%= link_to "manage", saved_searches_path(label: label) %>)
- <% presenter.posts_for_saved_search_category(category).each do |post| %>
- <%= PostPresenter.preview(post, :tags => "search:#{category}") %>
+ <% presenter.posts_for_saved_search_category(label).each do |post| %>
+ <%= PostPresenter.preview(post, :tags => "search:#{label}") %>
<% end %>
diff --git a/app/views/users/_statistics.html.erb b/app/views/users/_statistics.html.erb
index dfe64eb90..3e37d8e8e 100644
--- a/app/views/users/_statistics.html.erb
+++ b/app/views/users/_statistics.html.erb
@@ -122,19 +122,6 @@
Feedback |
<%= presenter.feedbacks(self) %> |
-
-
- | Subscriptions |
-
- <% presenter.subscriptions.each do |subscription| %>
-
- <%= link_to subscription.pretty_name, posts_path(:tags => "sub:#{user.name}:#{subscription.name}") %>
- –
- <%= presenter.tag_links_for_subscription(self, subscription) %>
-
- <% end %>
- |
-
<% if presenter.previous_names(self).present? %>
@@ -148,13 +135,26 @@
| Saved Searches |
- <% SavedSearch.categories_for(CurrentUser.user).each do |category| %>
- <%= link_to category, posts_path(tags: "search:#{category}") %>
+ <% SavedSearch.labels_for(CurrentUser.user.id).each do |label| %>
+ <%= link_to label, posts_path(tags: "search:#{label}") %>
<% end %>
|
<% end %>
+
+ | Subscriptions |
+
+ <% presenter.subscriptions.each do |subscription| %>
+
+ <%= link_to subscription.pretty_name, posts_path(:tags => "sub:#{user.name}:#{subscription.name}") %>
+ –
+ <%= presenter.tag_links_for_subscription(self, subscription) %>
+
+ <% end %>
+ |
+
+
| API Key |
diff --git a/config/routes.rb b/config/routes.rb
index df7fa94ee..c8877a524 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -235,10 +235,9 @@ Rails.application.routes.draw do
post "reports/post_versions_create" => "reports#post_versions_create"
resources :saved_searches, :except => [:show] do
collection do
- get :categories
+ get :labels
end
end
- resource :saved_search_category_change, :only => [:new, :create]
resource :session do
collection do
get :sign_out
diff --git a/db/migrate/20170314235626_add_tags_to_saved_searches.rb b/db/migrate/20170314235626_add_tags_to_saved_searches.rb
new file mode 100644
index 000000000..b1cfba068
--- /dev/null
+++ b/db/migrate/20170314235626_add_tags_to_saved_searches.rb
@@ -0,0 +1,7 @@
+class AddTagsToSavedSearches < ActiveRecord::Migration
+ def change
+ add_column :saved_searches, :labels, "text", array: true, null: false, default: []
+ add_index :saved_searches, :labels, using: :gin
+ rename_column :saved_searches, :tag_query, :query
+ end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 7cd5193a5..1873e5a11 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -777,6 +777,74 @@ CREATE SEQUENCE artists_id_seq
ALTER SEQUENCE artists_id_seq OWNED BY artists.id;
+--
+-- Name: bank_balances; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE bank_balances (
+ id integer NOT NULL,
+ user_id integer NOT NULL,
+ amount integer NOT NULL,
+ created_at timestamp without time zone NOT NULL,
+ updated_at timestamp without time zone NOT NULL,
+ nonce character varying NOT NULL
+);
+
+
+--
+-- Name: bank_balances_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE bank_balances_id_seq
+ START WITH 1
+ INCREMENT BY 1
+ NO MINVALUE
+ NO MAXVALUE
+ CACHE 1;
+
+
+--
+-- Name: bank_balances_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE bank_balances_id_seq OWNED BY bank_balances.id;
+
+
+--
+-- Name: bank_transactions; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE bank_transactions (
+ id integer NOT NULL,
+ user_id integer NOT NULL,
+ amount integer NOT NULL,
+ nonce character varying NOT NULL,
+ type character varying NOT NULL,
+ data text,
+ created_at timestamp without time zone NOT NULL,
+ updated_at timestamp without time zone NOT NULL
+);
+
+
+--
+-- Name: bank_transactions_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE bank_transactions_id_seq
+ START WITH 1
+ INCREMENT BY 1
+ NO MINVALUE
+ NO MAXVALUE
+ CACHE 1;
+
+
+--
+-- Name: bank_transactions_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE bank_transactions_id_seq OWNED BY bank_transactions.id;
+
+
--
-- Name: bans; Type: TABLE; Schema: public; Owner: -
--
@@ -2838,11 +2906,12 @@ ALTER SEQUENCE posts_id_seq OWNED BY posts.id;
CREATE TABLE saved_searches (
id integer NOT NULL,
user_id integer,
- tag_query text,
+ query text,
name text,
category character varying,
created_at timestamp without time zone,
- updated_at timestamp without time zone
+ updated_at timestamp without time zone,
+ labels text[] DEFAULT '{}'::text[] NOT NULL
);
@@ -3415,6 +3484,20 @@ ALTER TABLE ONLY artist_versions ALTER COLUMN id SET DEFAULT nextval('artist_ver
ALTER TABLE ONLY artists ALTER COLUMN id SET DEFAULT nextval('artists_id_seq'::regclass);
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY bank_balances ALTER COLUMN id SET DEFAULT nextval('bank_balances_id_seq'::regclass);
+
+
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY bank_transactions ALTER COLUMN id SET DEFAULT nextval('bank_transactions_id_seq'::regclass);
+
+
--
-- Name: id; Type: DEFAULT; Schema: public; Owner: -
--
@@ -4489,6 +4572,22 @@ ALTER TABLE ONLY artists
ADD CONSTRAINT artists_pkey PRIMARY KEY (id);
+--
+-- Name: bank_balances_pkey; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY bank_balances
+ ADD CONSTRAINT bank_balances_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: bank_transactions_pkey; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY bank_transactions
+ ADD CONSTRAINT bank_transactions_pkey PRIMARY KEY (id);
+
+
--
-- Name: bans_pkey; Type: CONSTRAINT; Schema: public; Owner: -
--
@@ -4993,6 +5092,34 @@ CREATE INDEX index_artists_on_other_names_index ON artists USING gin (other_name
CREATE INDEX index_artists_on_other_names_trgm ON artists USING gin (other_names gin_trgm_ops);
+--
+-- Name: index_bank_balances_on_user_id; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE UNIQUE INDEX index_bank_balances_on_user_id ON bank_balances USING btree (user_id);
+
+
+--
+-- Name: index_bank_transactions_on_created_at; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_bank_transactions_on_created_at ON bank_transactions USING btree (created_at);
+
+
+--
+-- Name: index_bank_transactions_on_nonce; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE UNIQUE INDEX index_bank_transactions_on_nonce ON bank_transactions USING btree (nonce);
+
+
+--
+-- Name: index_bank_transactions_on_user_id; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_bank_transactions_on_user_id ON bank_transactions USING btree (user_id);
+
+
--
-- Name: index_bans_on_banner_id; Type: INDEX; Schema: public; Owner: -
--
@@ -6926,10 +7053,17 @@ CREATE INDEX index_saved_searches_on_category ON saved_searches USING btree (cat
--
--- Name: index_saved_searches_on_tag_query; Type: INDEX; Schema: public; Owner: -
+-- Name: index_saved_searches_on_labels; Type: INDEX; Schema: public; Owner: -
--
-CREATE INDEX index_saved_searches_on_tag_query ON saved_searches USING btree (tag_query);
+CREATE INDEX index_saved_searches_on_labels ON saved_searches USING gin (labels);
+
+
+--
+-- Name: index_saved_searches_on_query; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX index_saved_searches_on_query ON saved_searches USING btree (query);
--
@@ -7464,7 +7598,15 @@ INSERT INTO schema_migrations (version) VALUES ('20170112060921');
INSERT INTO schema_migrations (version) VALUES ('20170117233040');
+INSERT INTO schema_migrations (version) VALUES ('20170126020516');
+
+INSERT INTO schema_migrations (version) VALUES ('20170126214445');
+
INSERT INTO schema_migrations (version) VALUES ('20170218104710');
INSERT INTO schema_migrations (version) VALUES ('20170302014435');
+INSERT INTO schema_migrations (version) VALUES ('20170314204631');
+
+INSERT INTO schema_migrations (version) VALUES ('20170314235626');
+
diff --git a/script/fixes/044_initialized_saved_search_tags.rb b/script/fixes/044_initialized_saved_search_tags.rb
new file mode 100644
index 000000000..90501ebc2
--- /dev/null
+++ b/script/fixes/044_initialized_saved_search_tags.rb
@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'config', 'environment'))
+
+ActiveRecord::Base.connection.execute("set statement_timeout = 0")
+
+SavedSearch.find_each do |ss|
+ ss.labels = [ss.category]
+ ss.save
+end
|