From d1edd86e11108629c6b4cbfaccea4c0614b6e95b Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 5 Mar 2015 10:40:10 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=A1=B9=E7=9B=AE=E8=8E=B7=E5=8F=96=202?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E6=AD=A4=E7=BB=84=E7=BB=87=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E9=A1=B9=E7=9B=AE=E6=97=B6=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/welcome_controller.rb         | 36 ++++++++--------
 app/views/welcome/_hot_projects_list.html.erb |  4 +-
 app/views/welcome/index.html.erb              | 41 +++++++++----------
 3 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index db2f287eb..4ee5ddbf1 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -27,28 +27,31 @@ class WelcomeController < ApplicationController
   def index
     # 企业版定制: params[:project]为传过来的参数
     unless params[:organization].nil?
-      @cur_projects = Project.find(params[:organization])
-      @organization = @cur_projects.enterprise_name              
-      @organization_projects = (current_user.admin? || User.current.member_of?(@cur_projects)) ? Project.where("enterprise_name =? ", @organization) : Project.all_public.where("enterprise_name =? ", @organization)    
-      @e_count = @organization_projects.count
-      @part_projects = []
-      # 取十个
-      @organization_projects.each do |obj| 
-        break if(@organization_projects[10] == obj)
-        @part_projects << Project.visible.find_by_id("#{obj.id}") unless obj.id.nil?
-      end
-      # 不够十个的用最火项目替代
-      @e_count < 9 ? @part_projects = find_miracle_project( 9 - @e_count, 3,"score desc") : @part_projects
-      # 配置文件首页定制
+      @organization = Organization.find params[:organization]
+      @organization_projects = Project.visible.joins(:project_status).joins("LEFT JOIN project_scores ON projects.id = project_scores.project_id").where("projects.organization_id = ?", 1).order("score DESC").limit(10).all
+      @part_projects = @organization_projects.count < 9 ? find_miracle_project( 9 - @organization_projects.count, 3,"score desc") : []
+      # @cur_projects = Project.find(params[:organization])
+      # @organization = @cur_projects.enterprise_name
+      # @organization_projects = (current_user.admin? || User.current.member_of?(@cur_projects)) ? Project.where("enterprise_name =? ", @organization) : Project.all_public.where("enterprise_name =? ", @organization)
+      # @e_count = @organization_projects.count
+      # @part_projects = []
+      # # 取十个
+      # @organization_projects.each do |obj|
+      #   break if(@organization_projects[10] == obj)
+      #   @part_projects << Project.visible.find_by_id("#{obj.id}") unless obj.id.nil?
+      # end
+      # # 不够十个的用最火项目替代
+      # @e_count < 9 ? @part_projects = find_miracle_project( 9 - @e_count, 3,"score desc") : @part_projects
+      # # 配置文件首页定制
       @enterprise_page = FirstPage.find_by_page_type('enterprise')
       if @enterprise_page.nil?
         @enterprise_page = FirstPage.new
         @enterprise_page.page_type = 'enterprise'
       end
-      # 主页配置部分结束    
-      
+      # 主页配置部分结束
     end
     # end 企业版定制结束
+
     if @first_page.nil? ||  @first_page.sort_type.nil?
       @projects = find_miracle_project(10, 3,"score desc")
     else
@@ -74,7 +77,8 @@ class WelcomeController < ApplicationController
           @projects = @projects_all.order("score desc")
       end
     end
-
+  rescue Exception => e
+    render_404
   end
 
   def robots
diff --git a/app/views/welcome/_hot_projects_list.html.erb b/app/views/welcome/_hot_projects_list.html.erb
index 92e1469cd..d14a6901b 100644
--- a/app/views/welcome/_hot_projects_list.html.erb
+++ b/app/views/welcome/_hot_projects_list.html.erb
@@ -5,7 +5,9 @@
 	<!-- 上左下右 -->
 	<div style="float: left; margin-left: 10px; width: 380px;">
 		<% unless project.is_public %>
-		<span class="private_project"> <%= l(:label_private) %> </span>
+		    <span class="private_project">
+              <%= l(:label_private) %>
+            </span>
 		<% end %>
 		<%= link_to( project.name, project_path(project.id), :class => "d-g-blue d-p-project-name",:title => "#{project.name}" )%>
 		(<%= link_to l(:label_project_member_amount, :count=>projectCount(project)), project_member_path(project) ,:course =>'0' %>)
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 3e0a50ceb..76ca25743 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -35,7 +35,7 @@
 				<% if get_avatar?(@first_page) %>
 					<%= image_tag(url_to_avatar(@first_page), width:@first_page.image_width,height: @first_page.image_height) %>
 				<% else %>
-					<%= image_tag '/images/transparent.png', width:@first_page.image_width,height: @first_page.image_height %>
+					<%= image_tag @organization.logo_link, width:@first_page.image_width,height: @first_page.image_height %>
 				<% end %>
 			<% else %>
               <%= image_tag(url_to_avatar(@enterprise_page), width:@first_page.image_width,height: @first_page.image_height) %>
@@ -47,9 +47,9 @@
 					<%= @first_page.description.html_safe %>
 				<% end %>
 			<% else %>
-            <span class="font_welcome_school" style="color: #E8770D">
-              <%=  @organization %>
-            </span>
+                <span class="font_welcome_school" style="color: #E8770D">
+                  <%=  @organization.name %>
+                </span>
             <br/>
             <span class="font_welcome_trustie">
               <%= @enterprise_page.title %>
@@ -86,24 +86,21 @@
 				<% end; reset_cycle  %>
 			<!-- 企业版项目 -->
 			<% else %>
-				<% if @e_count == 0 %>
-					<div id="flash_notice" class="flash notice"><%= l(:label_enterprise_tips) %></div>
-					<% @projects.map do |project| %>
-					<%= render :partial => 'hot_projects_list', :locals => {:project => project} %>
-				<% end %>
-				<% elsif @e_count < 10 %>					
-					<% @organization_projects.map do |project| %>
-						<%= render :partial => 'hot_projects_list', :locals => {:project => project} %>
-					<% end %>
-					<div id="flash_notice" class="flash notice"><%= l(:label_part_enterprise_tips) %></div>
-					<% @part_projects.map do |project| %>
-						<%= render :partial => 'hot_projects_list', :locals => {:project => project} %>
-					<% end %>
-				<% else %>
-					<% @part_projects.map do |project| %>
-						<%= render :partial => 'hot_projects_list', :locals => {:project => project} %>
-					<% end %>						
-				<% end %>
+              <% if @part_projects.empty? %>
+                  <% @projects.map do |project| %>
+                      <%= render :partial => 'hot_projects_list', :locals => {:project => project} %>
+                  <% end %>
+              <% else %>
+                  <% @organization_projects.map do |project| %>
+                      <%= render :partial => 'hot_projects_list', :locals => {:project => project} %>
+                  <% end %>
+                  <div id="errorExplanation">
+                    <%= l(:label_part_enterprise_tips) %>
+                  </div>
+                  <% @part_projects.map do |project| %>
+                      <%= render :partial => 'hot_projects_list', :locals => {:project => project} %>
+                  <% end %>
+              <% end %>
 			<% end %>
 		</ul>
 	</div>