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

fix parent metatag search

Browse Source
This commit is contained in:
albert
2011-11-01 18:39:25 -04:00
parent 71da9cbc4c
commit 1a435419c7
8 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/dmails.js
View File

@@ -1,10 +0,0 @@
(function() {
Danbooru.Dmail = {};
Danbooru.Dmail.initialize_all = function() {
}
})();
$(document).ready(function() {
Danbooru.Dmail.initialize_all();
});

3
app/assets/javascripts/forum_posts.js
View File

@@ -1,3 +0,0 @@
(function() {
Danbooru.ForumPost = {};
})();

5
app/assets/javascripts/notes.js
View File

@@ -392,7 +392,7 @@ Danbooru.Note = {
start: function() {
$("#original-file-link").click();
$("#image").one("click", Danbooru.Note.TranslationMode.create_note);
Danbooru.notice("Click on the image to create a note (shortcut is ctrl+a)");
Danbooru.notice("Click on the image to create a note (shortcut is n)");
},
stop: function() {
@@ -474,8 +474,7 @@ Danbooru.Note = {
$(function() {
if ($("#c-posts #a-show").size() > 0) {
$("#translate").one("click", Danbooru.Note.TranslationMode.start);
// $("#note-container").width($("#image").width()).height($("#image").height());
$(document).bind("keydown", "ctrl+a", Danbooru.Note.TranslationMode.start);
$(document).bind("keydown", "n", Danbooru.Note.TranslationMode.start);
Danbooru.Note.load_all();
$("#image").click(Danbooru.Note.Box.toggle_all);
}

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

@@ -1,2 +0,0 @@
$(function() {
});

1
app/assets/javascripts/wiki_pages.js
View File

@@ -1 +0,0 @@

5
app/assets/stylesheets/common/jquery_ui_custom.css.scss
View File

@@ -4,3 +4,8 @@ div.ui-dialog {
margin-bottom: 1em;
}
}
.ui-state-highlight {
border: 2px solid #999;
background: #eee;
}

4
app/models/post.rb
View File

@@ -710,6 +710,10 @@ class Post < ActiveRecord::Base
relation = relation.where("posts.approver_id = ?", q[:approver_id])
end
if q[:parent_id]
relation = relation.where("(posts.id = ? or posts.parent_id = ?)", q[:parent_id], q[:parent_id])
end
if q[:rating] == "q"
relation = relation.where("posts.rating = 'q'")
elsif q[:rating] == "s"

5
app/models/tag.rb
View File

@@ -213,7 +213,7 @@ class Tag < ActiveRecord::Base
}
scan_query(query).each do |token|
if token =~ /\A(-uploader|uploader|-approver|approver|-pool|pool|-fav|fav|sub|md5|-rating|rating|width|height|mpixels|score|filesize|source|id|date|order|status|tagcount|gentags|arttags|chartags|copytags):(.+)\Z/
if token =~ /\A(-uploader|uploader|-approver|approver|-pool|pool|-fav|fav|sub|md5|-rating|rating|width|height|mpixels|score|filesize|source|id|date|order|status|tagcount|gentags|arttags|chartags|copytags|parent):(.+)\Z/
case $1
when "-uploader"
q[:uploader_id_neg] ||= []
@@ -293,6 +293,9 @@ class Tag < ActiveRecord::Base
when "copytags"
q[:copyright_tag_count] = parse_helper($2)
when "parent"
q[:parent_id] = $2.to_i
when "order"
q[:order] = $2