my_forum 0.0.1.beta20 → 0.0.1.beta21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e054926f1a88d4ffeaab8dbbbe0ba2e669e49a4
-  data.tar.gz: 3282b3e486cc2f8cc6854208701e136e0cd0702f
+  metadata.gz: c11068cd89ded12b374df93e26bbf158a42e0f84
+  data.tar.gz: 1378f0a856061dbf5a547666578eaa31825d6ca0
 SHA512:
-  metadata.gz: 3fde931da8c1719e757c2f37667716ffd7c6fbd15d583c815a2ed8727a383a5fbd5d64e351aba9e3be6581621bd95f79a23bc116c10c34343845697dd50edcba
-  data.tar.gz: 94477a568e10e026295bf79cdac155cabd1fd4e93f9cfc1bac29e80f31e7d38329fc1ec7d104d81da368f4139075d412157fe86462af447cfb6415d078d998fb
+  metadata.gz: 112f7ff639947e8e4d3d3e3d247588cba505b028dd72288c48ceb82a24d3fe8775ca0098f331bd00beec1b6648110634c99d56326bb43eba0d66c731d095190f
+  data.tar.gz: 4d64f4d3ab47161a73f9db84f6efc7e4163b4265cbe7b9b266d0bceed884fded1a40e34163d929afceef5d566485b02e36b117d52faaafb97fa9f43936e0ef3e

data/app/controllers/my_forum/welcome_controller.rb

@@ -13,14 +13,15 @@ module MyForum
 
       # Don`r forget permissions
       available_forum_ids = MyForum::Forum.where(category_id: @forum_categories.map(&:id)).pluck(:id)
-      @recent_topics = if available_forum_ids.blank?
+      @recent_posts = if available_forum_ids.blank?
                         []
                       else
                         Topic.find_by_sql("
-                          SELECT my_forum_topics.* FROM my_forum_topics
-                          JOIN my_forum_forums ON my_forum_forums.id = my_forum_topics.forum_id
-                          WHERE my_forum_forums.id IN (#{available_forum_ids.join(',')})
-                          ORDER BY my_forum_topics.updated_at DESC limit 10
+                          SELECT posts.id, posts.user_id, posts.text, posts.topic_id, posts.updated_at, topics.name as topic_name, topics.forum_id FROM my_forum_posts AS posts
+                          LEFT JOIN my_forum_topics AS topics ON posts.topic_id = topics.id
+                          LEFT JOIN my_forum_forums AS forums ON forums.id = topics.forum_id
+                          WHERE posts.id IN (SELECT MAX(id) FROM my_forum_posts GROUP BY topic_id)
+                          ORDER BY posts.id DESC LIMIT 10
                         ")
                       end
 

data/app/views/my_forum/welcome/index.haml

@@ -13,7 +13,7 @@
               .col-md-2.col-sm-2.forum-info= forum_stat(forum)
               .col-md-3.col-sm-3.forum-last-message-info= forum_last_message_info(forum)
 
-  - if @recent_topics
+  - if @recent_posts
     #recent_topics
       %table.table
         %caption= t('.recent_topics')
@@ -23,11 +23,11 @@
             %th= t('.last_message_from')
             %th= t('.date')
         %tbody
-          -@recent_topics.each do |topic|
+          -@recent_posts.each do |post|
             %tr
-              %td= link_to topic.name, forum_topic_path(topic.forum, topic)
-              %td= topic.posts.last.user.login
-              %td= forum_time(topic.updated_at)
+              %td= link_to post.topic_name, forum_topic_path(post.forum, post.topic_id)
+              %td= post.user.login
+              %td= forum_time(post.updated_at)
 
   #online_users.well
     = t('.users_online')

data/lib/my_forum/version.rb

@@ -1,3 +1,3 @@
 module MyForum
-  VERSION = "0.0.1.beta20"
+  VERSION = "0.0.1.beta21"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: my_forum
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta20
+  version: 0.0.1.beta21
 platform: ruby
 authors:
 - Vitaly Omelchenko