diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 4580798ee..5921fb377 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -262,7 +262,12 @@ module ProjectsHelper # @projects_status = @projects_status.reorder('grade').all.reverse # Project.joins(@projects_status).limit(10) limit = 10 - Project.find_by_sql("SELECT * FROM projects RIGHT OUTER JOIN (SELECT * FROM project_statuses ORDER BY grade DESC LIMIT #{limit} ) AS t ON projects.id = t.project_id ") + #Project.find_by_sql("SELECT * FROM projects RIGHT OUTER JOIN (SELECT * FROM project_statuses ORDER BY grade DESC LIMIT #{limit} ) AS t ON projects.id = t.project_id ") + Project.find_by_sql(" + SELECT p.id, p.name, p.description, p.identifier, t.project_id + FROM projects AS p RIGHT OUTER JOIN ( + SELECT project_id,grade FROM project_statuses + WHERE project_type = 0 ORDER BY grade DESC LIMIT #{limit} ) AS t ON p.id = t.project_id ") end end diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index da406ad66..d5194e5d4 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -100,13 +100,14 @@ } } + <%= stylesheet_link_tag 'welcome' %>
<%= project.description %>