Skip to content

Commit

Permalink
[webui] Be coherent with variables name
Browse files Browse the repository at this point in the history
  • Loading branch information
dmarcoux committed Apr 29, 2018
1 parent d65c81b commit cd80bf4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/api/app/controllers/webui/main_controller.rb
Expand Up @@ -21,7 +21,7 @@ def gather_busy
end

def index
@news = StatusMessage.alive.limit(4).to_a
@status_messages = StatusMessage.alive.limit(4).to_a
@workerstatus = Rails.cache.fetch('workerstatus_hash', expires_in: 10.minutes) do
WorkerStatus.hidden.to_hash
end
Expand Down
4 changes: 2 additions & 2 deletions src/api/app/views/webui/main/_status_messages.html.haml
@@ -1,9 +1,9 @@
- if @news.present? || User.current.is_admin?
- if @status_messages.present? || User.current.is_admin?
.box.box-shadow#messages
%h2.box-header
Announcements
\#{link_to('', news_feed_path(format: 'rss'), { class: 'alignright icons-feeds', title: 'RSS Feed' })}
- @news.each do |msg|
- @status_messages.each do |msg|
.grid_4.news-sender
= user_with_realname_and_icon msg.user, short: true
wrote #{time_ago_in_words(msg.created_at)} ago
Expand Down

0 comments on commit cd80bf4

Please sign in to comment.