Mercurial > hg > soundsoftware-site
comparison app/controllers/welcome_controller.rb @ 364:7a616ddc3331 cannam-pre-20110113-merge
Merge
| author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
|---|---|
| date | Fri, 01 Apr 2011 12:03:41 +0100 |
| parents | ce85aa993384 |
| children | dcfde3922ec2 |
comparison
equal
deleted
inserted
replaced
| 362:d1eb5d381a77 | 364:7a616ddc3331 |
|---|---|
| 23 | 23 |
| 24 def index | 24 def index |
| 25 @news = News.latest User.current | 25 @news = News.latest User.current |
| 26 @projects = Project.latest User.current | 26 @projects = Project.latest User.current |
| 27 | 27 |
| 28 # tests if user is logged in to gfenerate the tips of the day list | 28 # tests if user is logged in to generate the tips of the day list |
| 29 if User.current.logged? | 29 if User.current.logged? |
| 30 @tipsoftheday = Setting.tipoftheday_text | 30 @tipsoftheday = Setting.tipoftheday_text |
| 31 else | 31 else |
| 32 @tipsoftheday = '' | 32 @tipsoftheday = '' |
| 33 end | 33 end |