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

fixes #1169

Browse Source
This commit is contained in:
Toks
2013-04-01 19:50:36 -04:00
parent 76487c46fb
commit 8473676778
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/models/tag.rb
View File

@@ -268,27 +268,29 @@ class Tag < ActiveRecord::Base
case $1 case $1
when "-user" when "-user"
q[:uploader_id_neg] ||= [] q[:uploader_id_neg] ||= []
q[:uploader_id_neg] << User.name_to_id($2) user_id = User.name_to_id($2)
q[:uploader_id_neg] << user_id unless user_id.blank?
when "user" when "user"
q[:uploader_id] = User.name_to_id($2) q[:uploader_id] = User.name_to_id($2)
q[:uploader_id] = -1 if q[:uploader_id].nil? q[:uploader_id] = -1 if q[:uploader_id].blank?
when "-approver" when "-approver"
q[:approver_id_neg] ||= [] q[:approver_id_neg] ||= []
q[:approver_id_neg] << User.name_to_id($2) user_id = User.name_to_id($2)
q[:approver_id_neg] << user_id unless user_id.blank?
when "approver" when "approver"
q[:approver_id] = User.name_to_id($2) q[:approver_id] = User.name_to_id($2)
q[:approver_id] = -1 if q[:approver_id].nil? q[:approver_id] = -1 if q[:approver_id].blank?
when "commenter", "comm" when "commenter", "comm"
q[:commenter_id] = User.name_to_id($2) q[:commenter_id] = User.name_to_id($2)
q[:commenter_id] = -1 if q[:commenter_id].nil? q[:commenter_id] = -1 if q[:commenter_id].blank?
when "noter" when "noter"
q[:noter_id] = User.name_to_id($2) q[:noter_id] = User.name_to_id($2)
q[:noter_id] = -1 if q[:noter_id].nil? q[:noter_id] = -1 if q[:noter_id].blank?
when "-pool" when "-pool"
q[:tags][:exclude] << "pool:#{Pool.name_to_id($2)}" q[:tags][:exclude] << "pool:#{Pool.name_to_id($2)}"