diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb index 8be34a318..66e3d6e05 100644 --- a/app/controllers/organizations_controller.rb +++ b/app/controllers/organizations_controller.rb @@ -93,7 +93,7 @@ class OrganizationsController < ApplicationController end # 热门项目 if @organization.org_subfields.where(:field_type => "Comppro", :hide => 0).count > 0 - @excellent_projects = Course.where(:is_public => true, :status => true, :hot => true) + @excellent_projects = Project.where(:is_public => true, :status => true, :hot => true) end # 最新动态, 来自我关联的项目和课程 if @organization.org_subfields.where(:field_type => "Compact", :hide => 0).count > 0 diff --git a/app/views/organizations/_org_custom_right2.html.erb b/app/views/organizations/_org_custom_right2.html.erb index 27b434ecb..b6229cd69 100644 --- a/app/views/organizations/_org_custom_right2.html.erb +++ b/app/views/organizations/_org_custom_right2.html.erb @@ -3,18 +3,18 @@ <% if containers.blank? %>

该模块暂时没有相关内容

<% else %> - <% container = cotainers.first %> + <% container = containers.first %>
  • <%= link_to "#{container.name}".html_safe, project_path(container), :class => "por_hidden_w205 link-black fl", :title => container.name, :target => "_blank" %> -

    活跃度<%= static_project_score(@project.project_score) %>

    +

    活跃度<%= static_project_score(container.project_score) %>

    - <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => activity.id, :content=> activity.description, :maxheight => 20, :maxwordsnum => 70, :maxwidth => 0, :cl => "por_project_p"} %> + <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => container.id, :content=> container.description, :maxheight => 20, :maxwordsnum => 70, :maxwidth => 0, :cl => "por_project_p"} %>
  • - <% cotainers[1..4].each do |container| %> + <% containers[1..4].each do |container| %>
  • <%= link_to "#{container.name}".html_safe, project_path(container), :class => "por_hidden_w205 link-black fl", :title => container.name, :target => "_blank" %> -

    活跃度<%= static_project_score(@project.project_score) %>

    +

    活跃度<%= static_project_score(container.project_score) %>

  • <% end %> diff --git a/app/views/organizations/_organization_content_extension.html.erb b/app/views/organizations/_organization_content_extension.html.erb index 48abd48b9..919961057 100644 --- a/app/views/organizations/_organization_content_extension.html.erb +++ b/app/views/organizations/_organization_content_extension.html.erb @@ -1,8 +1,8 @@ -

    - - <%= content.to_s.html_safe%> - -

    +
    + + <%= content.to_s.html_safe%> + +