jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#2523 Enable categorized saved searches by default

Browse Source
This commit is contained in:
Toks
2015-11-13 00:14:08 -05:00
parent d6b9a1fb52
commit 2d3b7182bc
6 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/posts.js
View File

@@ -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(

2
app/logical/anonymous_user.rb
View File

@@ -237,7 +237,7 @@ class AnonymousUser
false
end
def enable_categorized_saved_searches?
def disable_categorized_saved_searches?
false
end

4
app/models/user.rb
View File

@@ -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"

2
app/views/layouts/default.html.erb
View File

@@ -21,7 +21,7 @@
<meta name="style-usernames" content="<%= CurrentUser.user.style_usernames? %>">
<meta name="mobile-mode" content="<%= CurrentUser.mobile_mode? %>">
<meta name="last-forum-read-at" content="<%= CurrentUser.user.last_forum_read_at %>">
<meta name="enable-categorized-saved-searches" content="<%= CurrentUser.enable_categorized_saved_searches? %>">
<meta name="disable-categorized-saved-searches" content="<%= CurrentUser.disable_categorized_saved_searches? %>">
<%= auto_discovery_link_tag :atom, posts_path(:format => "atom", :tags => params[:tags]) %>
<%= stylesheet_link_tag "application", :media => "screen" %>
<% if CurrentUser.user.custom_style.present? %>

2
app/views/users/edit.html.erb
View File

@@ -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 %>
<div class="input text optional field_with_hint">
<label class="text optional" for="user_favorite_tags">Frequent tags</label>

13
script/fixes/038_reset_categorized_saved_search_setting.rb Normal file
View File

@@ -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