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

Merge branch 'master' of https://github.com/r888888888/danbooru

Browse Source
This commit is contained in:
Toks
2013-05-29 16:58:36 -04:00
parent a4f47cfc41 9df5952778
commit 3faee4a0b5
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/post_flag.rb
View File

@@ -45,7 +45,7 @@ class PostFlag < ActiveRecord::Base
if params[:is_resolved] == "true" if params[:is_resolved] == "true"
q = q.resolved q = q.resolved
elsif params[is_resolved] == "false" elsif params[:is_resolved] == "false"
q = q.unresolved q = q.unresolved
end end

5
db/structure.sql
View File

@@ -2096,7 +2096,8 @@ CREATE TABLE pools (
post_count integer DEFAULT 0 NOT NULL, post_count integer DEFAULT 0 NOT NULL,
is_deleted boolean DEFAULT false NOT NULL, is_deleted boolean DEFAULT false NOT NULL,
created_at timestamp without time zone NOT NULL, created_at timestamp without time zone NOT NULL,
updated_at timestamp without time zone NOT NULL updated_at timestamp without time zone NOT NULL,
category character varying(255) DEFAULT 'series'::character varying NOT NULL
); );
@@ -6413,3 +6414,5 @@ INSERT INTO schema_migrations (version) VALUES ('20130409191950');
INSERT INTO schema_migrations (version) VALUES ('20130417221643'); INSERT INTO schema_migrations (version) VALUES ('20130417221643');
INSERT INTO schema_migrations (version) VALUES ('20130424121410'); INSERT INTO schema_migrations (version) VALUES ('20130424121410');
INSERT INTO schema_migrations (version) VALUES ('20130506154136');