From 02cfd467867eb2bbba155787ff70251bbf64d483 Mon Sep 17 00:00:00 2001 From: Natalia Polishchuk Date: Fri, 2 Sep 2016 12:05:39 -0700 Subject: [PATCH 1/2] fix sidebar styles --- .../app/views/archives_sidebar/_content.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb b/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb index 7d74c3347..1ea942567 100644 --- a/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb +++ b/lib/archives_sidebar/app/views/archives_sidebar/_content.html.erb @@ -1,6 +1,6 @@ <% unless sidebar.archives.blank? %> -

<%= sidebar.title %>

-
+

<%= sidebar.title %>

+
    <% sidebar.archives.each do |month| %> <% counter = sidebar.show_count ? "(#{month[:article_count]})" : "" %> From f538479fc7a85f6b230bd8d3e255b355b9712b15 Mon Sep 17 00:00:00 2001 From: Natalia Polishchuk Date: Fri, 2 Sep 2016 13:44:47 -0700 Subject: [PATCH 2/2] fix user.profile.label --- app/controllers/admin/dashboard_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb index 32ea1f55c..4f5eeb2e5 100644 --- a/app/controllers/admin/dashboard_controller.rb +++ b/app/controllers/admin/dashboard_controller.rb @@ -17,7 +17,7 @@ def index @statsdrafts = Article.drafts.where('created_at > ?', today).count @statspages = Page.where('published_at > ?', today).count @statuses = Note.where('published_at > ?', today).count - @statuserposts = Article.published.where('published_at > ?', today).count(conditions: { user_id: current_user.id }) + @statuserposts = current_user.articles.published.where('published_at > ?', today).count @statcomments = Comment.where('created_at > ?', today).count @presumedspam = Comment.presumed_spam.where('created_at > ?', today).count @confirmed = Comment.ham.where('created_at > ?', today).count