From 2d3b7182bcec1a26e3ce1c3864b1209432a3863c Mon Sep 17 00:00:00 2001 From: Toks Date: Fri, 13 Nov 2015 00:14:08 -0500 Subject: [PATCH] #2523 Enable categorized saved searches by default --- app/assets/javascripts/posts.js | 2 +- app/logical/anonymous_user.rb | 2 +- app/models/user.rb | 4 ++-- app/views/layouts/default.html.erb | 2 +- app/views/users/edit.html.erb | 2 +- .../038_reset_categorized_saved_search_setting.rb | 13 +++++++++++++ 6 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 script/fixes/038_reset_categorized_saved_search_setting.rb diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js index 128f48081..eea90c1e7 100644 --- a/app/assets/javascripts/posts.js +++ b/app/assets/javascripts/posts.js @@ -526,7 +526,7 @@ Danbooru.Post.initialize_saved_searches = function() { $("#save-search").click(function() { var input = null; - if (Danbooru.meta("enable-categorized-saved-searches") === "true") { + if (Danbooru.meta("disable-categorized-saved-searches") === "false") { input = window.prompt("Category for this saved search (optional):"); } $.post( diff --git a/app/logical/anonymous_user.rb b/app/logical/anonymous_user.rb index 5390c6f94..a95e1c963 100644 --- a/app/logical/anonymous_user.rb +++ b/app/logical/anonymous_user.rb @@ -237,7 +237,7 @@ class AnonymousUser false end - def enable_categorized_saved_searches? + def disable_categorized_saved_searches? false end diff --git a/app/models/user.rb b/app/models/user.rb index e2dcd41f5..9e61f6dac 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -32,14 +32,14 @@ class User < ActiveRecord::Base has_saved_searches can_approve_posts can_upload_free - enable_categorized_saved_searches + disable_categorized_saved_searches ) include Danbooru::HasBitFlags has_bit_flags BOOLEAN_ATTRIBUTES, :field => "bit_prefs" attr_accessor :password, :old_password - attr_accessible :dmail_filter_attributes, :enable_privacy_mode, :enable_post_navigation, :new_post_navigation_layout, :password, :old_password, :password_confirmation, :password_hash, :email, :last_logged_in_at, :last_forum_read_at, :has_mail, :receive_email_notifications, :comment_threshold, :always_resize_images, :favorite_tags, :blacklisted_tags, :name, :ip_addr, :time_zone, :default_image_size, :enable_sequential_post_navigation, :per_page, :hide_deleted_posts, :style_usernames, :enable_auto_complete, :custom_style, :show_deleted_children, :enable_categorized_saved_searches, :as => [:moderator, :janitor, :gold, :member, :anonymous, :default, :builder, :admin] + attr_accessible :dmail_filter_attributes, :enable_privacy_mode, :enable_post_navigation, :new_post_navigation_layout, :password, :old_password, :password_confirmation, :password_hash, :email, :last_logged_in_at, :last_forum_read_at, :has_mail, :receive_email_notifications, :comment_threshold, :always_resize_images, :favorite_tags, :blacklisted_tags, :name, :ip_addr, :time_zone, :default_image_size, :enable_sequential_post_navigation, :per_page, :hide_deleted_posts, :style_usernames, :enable_auto_complete, :custom_style, :show_deleted_children, :disable_categorized_saved_searches, :as => [:moderator, :janitor, :gold, :member, :anonymous, :default, :builder, :admin] attr_accessible :level, :as => :admin validates_length_of :name, :within => 2..100, :on => :create validates_format_of :name, :with => /\A[^\s:]+\Z/, :on => :create, :message => "cannot have whitespace or colons" diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb index 5cd725970..97dc2bf9b 100644 --- a/app/views/layouts/default.html.erb +++ b/app/views/layouts/default.html.erb @@ -21,7 +21,7 @@ - + <%= auto_discovery_link_tag :atom, posts_path(:format => "atom", :tags => params[:tags]) %> <%= stylesheet_link_tag "application", :media => "screen" %> <% if CurrentUser.user.custom_style.present? %> diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 09e84bb8a..c748f570f 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -68,7 +68,7 @@ <%= f.input :enable_auto_complete, :as => :select, :collection => [["Yes", "true"], ["No", "false"]], :include_blank => false %> - <%= f.input :enable_categorized_saved_searches, :as => :select, :collection => [["No", "false"], ["Yes", "true"]], :include_blank => false %> + <%= f.input :disable_categorized_saved_searches, :as => :select, :collection => [["No", "false"], ["Yes", "true"]], :include_blank => false %>
diff --git a/script/fixes/038_reset_categorized_saved_search_setting.rb b/script/fixes/038_reset_categorized_saved_search_setting.rb new file mode 100644 index 000000000..1203e68a9 --- /dev/null +++ b/script/fixes/038_reset_categorized_saved_search_setting.rb @@ -0,0 +1,13 @@ +#!/usr/bin/env ruby + +require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'config', 'environment')) + +ActiveRecord::Base.connection.execute("set statement_timeout = 0") + +CurrentUser.user = User.admins.first +CurrentUser.ip_addr = "127.0.0.1" + +User.where("bit_prefs & ? > 0", User.flag_value_for("disable_categorized_saved_searches")).find_each do |user| + user.disable_categorized_saved_searches = false + user.save +end