Mercurial > hg > soundsoftware-site
comparison app/controllers/welcome_controller.rb @ 1349:4ff3f8b81ab3 luisf
Merge from live.
author | luisf <luis.figueira@eecs.qmul.ac.uk> |
---|---|
date | Thu, 11 Jul 2013 17:32:32 +0100 |
parents | 1f9cdee56991 |
children | 51364c0cd58f |
comparison
equal
deleted
inserted
replaced
1341:90d09ace39bf | 1349:4ff3f8b81ab3 |
---|---|
22 helper :projects | 22 helper :projects |
23 | 23 |
24 def index | 24 def index |
25 @site_project = Project.find_by_identifier "soundsoftware-site" | 25 @site_project = Project.find_by_identifier "soundsoftware-site" |
26 @site_news = [] | 26 @site_news = [] |
27 @site_news = News.latest_for @site_project if @site_project | 27 @site_news = News.latest_for(@site_project, 3) if @site_project |
28 | 28 |
29 # tests if user is logged in to generate the tips of the day list | 29 # tests if user is logged in to generate the tips of the day list |
30 if User.current.logged? | 30 if User.current.logged? |
31 @tipsoftheday = Setting.tipoftheday_text | 31 @tipsoftheday = Setting.tipoftheday_text |
32 else | 32 else |