my_forum 0.0.1.beta10 → 0.0.1.beta11
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/my_forum/welcome_controller.rb +10 -6
- data/lib/my_forum/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 10dad8230912925baaba5dff380a7a4cfa2fc5aa
|
|
4
|
+
data.tar.gz: 5bb4b627be10719f631772901c843b6b49cc1b6d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7b78a8580264fc0076fd049a34b091a98f502f4b647701b3c507793eaad781006fa476bbba136dcd4bbc96faaef3c31a0c4ce1736d122f35a2ef7814982a6c6e
|
|
7
|
+
data.tar.gz: 9f09fcc47d28248981bde6129d583d6dcc50b6e2120f0f82588a9718cb895aa63f936b2273634ae2c3c5d679b851e45243f7236685dae20ad5a121eca91018af
|
|
@@ -11,12 +11,16 @@ module MyForum
|
|
|
11
11
|
|
|
12
12
|
# Don`r forget permissions
|
|
13
13
|
available_forum_ids = MyForum::Forum.where(category_id: @forum_categories.map(&:id)).pluck(:id)
|
|
14
|
-
@recent_topics =
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
14
|
+
@recent_topics = if available_forum_ids.blank?
|
|
15
|
+
[]
|
|
16
|
+
else
|
|
17
|
+
Topic.find_by_sql("
|
|
18
|
+
SELECT my_forum_topics.* FROM my_forum_topics
|
|
19
|
+
JOIN my_forum_forums ON my_forum_forums.id = my_forum_topics.forum_id
|
|
20
|
+
WHERE my_forum_forums.id IN (#{available_forum_ids.join(',')})
|
|
21
|
+
ORDER BY my_forum_topics.updated_at DESC limit 10
|
|
22
|
+
")
|
|
23
|
+
end
|
|
20
24
|
|
|
21
25
|
end
|
|
22
26
|
end
|
data/lib/my_forum/version.rb
CHANGED