Mercurial > hg > soundsoftware-site

diff app/controllers/welcome_controller.rb @ 443:350acce374a2 cannam

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "cannam-pre-20110113-merge"
author Chris Cannam
date Mon, 06 Jun 2011 14:55:38 +0100
parents dcfde3922ec2
children 5e80956cc792
line wrap: on
line diff
--- a/app/controllers/welcome_controller.rb	Mon Jun 06 14:41:04 2011 +0100
+++ b/app/controllers/welcome_controller.rb	Mon Jun 06 14:55:38 2011 +0100
@@ -18,11 +18,16 @@
 class WelcomeController < ApplicationController
   caches_action :robots
 
+  include ProjectsHelper
+  helper :projects
+
   def index
-    @news = News.latest User.current
+    @site_project = Project.find_by_identifier "soundsoftware-site"
+    @site_news = []
+    @site_news = News.latest_for @site_project if @site_project
     @projects = Project.latest User.current
     
-    # tests if user is logged in to gfenerate the tips of the day list
+    # tests if user is logged in to generate the tips of the day list
     if User.current.logged?
       @tipsoftheday = Setting.tipoftheday_text
     else