my_forum 0.0.1.beta12 → 0.0.1.beta13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fac8ff36e2ec2d618a17dc4feb5a8a4474f83a0
-  data.tar.gz: 9a1c41aa8460c12b3adcd903d38d6a87494d82be
+  metadata.gz: 3d05bd4d494aa68f5d47341af87baf2596b8505b
+  data.tar.gz: 48609dd576844d2df68842e01b56b6e6e4aa79ad
 SHA512:
-  metadata.gz: 6282d232de51ac4611b2b374d19d2e66d3c6c25b2e4a2d8a4dbfd20d344d91dd3bd6a245274fb39e116ada31b846fe5791075ebfc2731ab10558c9d00983303e
-  data.tar.gz: 89cc16a59bd0bbf29c890e42b1a98596be41475d84fe35378fff875874373f93b24ea63ee3ed4c6d9af0c5f088e0db531dd9ffcc6aa61a7980ee6fec84141754
+  metadata.gz: 005dc4d10a8d3612d2882f15d2231415ba9b2c8f4677e0cccd8147781ad37948454af72bce152178ab288f70dd1d4b6f10de9f11c8045c322ecd7b3b379da55f
+  data.tar.gz: bd8ee7df43c42160f188e94aa89e344c4ff2ba196459e0dceb7b7ef79225f36827db3162809eb4181ae59800194780f1f5cb7806ded617ac717f2ae7170525ce

data/app/controllers/my_forum/application_controller.rb

@@ -36,7 +36,7 @@ module MyForum
       if local_time.to_date == Time.now.to_date
         return t('my_forum.today', hhmm: local_time.strftime('%H:%M'))
       elsif local_time.to_date == (Time.now - 1.day).to_date
-        return t('my_forum.yerstaday ', hhmm: local_time.strftime('%H:%M'))
+        return t('my_forum.yesterday ', hhmm: local_time.strftime('%H:%M'))
       end
 
       local_time.strftime('%Y-%m-%d %H:%M')

data/app/controllers/my_forum/welcome_controller.rb

@@ -3,24 +3,26 @@ require_dependency "my_forum/application_controller"
 module MyForum
   class WelcomeController < ApplicationController
     def index
-      return @forum_categories = Category.includes(:forums) if current_user && current_user.is_admin?
-
-      @forum_categories = Category.includes(:forums, :user_groups).
-          reject{|category| (category.user_groups.map(&:name) & (current_user_groups)).blank? }
+      @forum_categories = if current_user && current_user.is_admin?
+                            Category.includes(:forums)
+                          else
+                            @forum_categories = Category.includes(:forums, :user_groups).
+                              reject{|category| (category.user_groups.map(&:name) & (current_user_groups)).blank? }
+                          end
 
 
       # 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?
-        []
-      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
-        ")
-      end
+                        []
+                      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
+                        ")
+                      end
 
     end
   end

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

@@ -13,16 +13,16 @@
               .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)
 
-  #recent_topics
-    %table.table
-      %caption= t('.recent_topics')
-      %thead
-        %tr
-          %th= t('.topic_name')
-          %th= t('.last_message_from')
-          %th= t('.date')
-      %tbody
-        - if @recent_topics
+  - if @recent_topics
+    #recent_topics
+      %table.table
+        %caption= t('.recent_topics')
+        %thead
+          %tr
+            %th= t('.topic_name')
+            %th= t('.last_message_from')
+            %th= t('.date')
+        %tbody
           -@recent_topics.each do |topic|
             %tr
               %td= link_to topic.name, forum_topic_path(topic.forum, topic)

data/config/locales/ru.yml

@@ -2,7 +2,7 @@ ru:
   today: "Сегодня"
   my_forum:
     today: "Сегодня в %{hhmm}"
-    yerstaday: "Вчера в %{hhmm}"
+    yesterday: "Вчера в %{hhmm}"
     create_new_pm: 'Написать личное сообщение'
     create_new_topic: 'Создать новую тему'
     bbquote:

data/lib/my_forum/version.rb

@@ -1,3 +1,3 @@
 module MyForum
-  VERSION = "0.0.1.beta12"
+  VERSION = "0.0.1.beta13"
 end

metadata

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