diff --git a/app/assets/stylesheets/specific/pools.scss b/app/assets/stylesheets/specific/pools.scss index ed1878842..5be39a81e 100644 --- a/app/assets/stylesheets/specific/pools.scss +++ b/app/assets/stylesheets/specific/pools.scss @@ -81,3 +81,11 @@ div#c-pool-orders, div#c-favorite-group-orders { } } } + +ul.inline-pool-list { + display: inline; + + li { + display: inline; + } +} diff --git a/app/models/post.rb b/app/models/post.rb index 6cc0b6477..2bd1abb01 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -1031,11 +1031,16 @@ class Post < ActiveRecord::Base module PoolMethods def pools @pools ||= begin + return Pool.none if pool_string.blank? pool_ids = pool_string.scan(/\d+/) - Pool.where(["is_deleted = false and id in (?)", pool_ids]) + Pool.undeleted.where(id: pool_ids).series_first end end + def has_active_pools? + pools.length > 0 + end + def belongs_to_pool?(pool) pool_string =~ /(?:\A| )pool:#{pool.id}(?:\Z| )/ end diff --git a/app/views/moderator/post/queues/_post.html.erb b/app/views/moderator/post/queues/_post.html.erb new file mode 100644 index 000000000..91826bcc8 --- /dev/null +++ b/app/views/moderator/post/queues/_post.html.erb @@ -0,0 +1,43 @@ +
> + + +
+ +
+
diff --git a/app/views/moderator/post/queues/random.html.erb b/app/views/moderator/post/queues/random.html.erb index 261dc21ba..d95a164b0 100644 --- a/app/views/moderator/post/queues/random.html.erb +++ b/app/views/moderator/post/queues/random.html.erb @@ -13,45 +13,7 @@ <% @posts.each do |post| %> -
> - - -
- -
-
+ <%= render "post", post: post %> <% end %> diff --git a/app/views/moderator/post/queues/show.html.erb b/app/views/moderator/post/queues/show.html.erb index d59893763..14a83da03 100644 --- a/app/views/moderator/post/queues/show.html.erb +++ b/app/views/moderator/post/queues/show.html.erb @@ -24,46 +24,7 @@ <% @posts.each do |post| %> -
> - - -
- -
-
+ <%= render "post", post: post %> <% end %> diff --git a/app/views/pools/_inline_list.html.erb b/app/views/pools/_inline_list.html.erb new file mode 100644 index 000000000..73bfc7b89 --- /dev/null +++ b/app/views/pools/_inline_list.html.erb @@ -0,0 +1,5 @@ +