diff --git a/app/assets/stylesheets/common/simple_form.scss b/app/assets/stylesheets/common/simple_form.scss index 0efa07c42..d2926f181 100644 --- a/app/assets/stylesheets/common/simple_form.scss +++ b/app/assets/stylesheets/common/simple_form.scss @@ -17,7 +17,8 @@ form.simple_form { } span.hint { - margin-left: 1em; + display: block; + font-size: 70%; } textarea { diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 124c3bec2..21ec75472 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -144,6 +144,7 @@ module ApplicationHelper options[:value] ||= instance_variable_get("@#{object}").try(name) options[:preview_id] ||= "dtext-preview" options[:classes] ||= "" + options[:type] ||= "text" render "dtext/form", options end diff --git a/app/models/post_flag.rb b/app/models/post_flag.rb index 9b640cdcc..1c338a65d 100644 --- a/app/models/post_flag.rb +++ b/app/models/post_flag.rb @@ -33,6 +33,14 @@ class PostFlag < ActiveRecord::Base end end + def duplicate + where("to_tsvector('english', post_flags.reason) @@ to_tsquery('dup | duplicate | sample | smaller')") + end + + def not_duplicate + where("to_tsvector('english', post_flags.reason) @@ to_tsquery('!dup & !duplicate & !sample & !smaller')") + end + def post_tags_match(query) PostQueryBuilder.new(query).build(self.joins(:post)) end @@ -98,6 +106,8 @@ class PostFlag < ActiveRecord::Base q = q.where("reason LIKE ?", Reasons::REJECTED) when "deleted" q = q.where("reason = ? OR reason LIKE ?", Reasons::UNAPPROVED, Reasons::REJECTED) + when "duplicate" + q = q.duplicate end q diff --git a/app/views/dtext/_form.html.erb b/app/views/dtext/_form.html.erb index 02cc9bce9..c2f2fcc13 100644 --- a/app/views/dtext/_form.html.erb +++ b/app/views/dtext/_form.html.erb @@ -4,12 +4,17 @@ - input_name - preview_id - value +- type -->