From 2052d36abe60b5800772ee63f202d4c8541f93af Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Thu, 24 Apr 2014 08:46:10 +0800
Subject: [PATCH] issue:socialForge#381

---
 app/controllers/projects_controller.rb   | 4 ++--
 app/views/layouts/base_memos.html.erb    | 2 +-
 app/views/layouts/base_projects.html.erb | 2 +-
 app/views/projects/course.html.erb       | 2 +-
 app/views/projects/index.html.erb        | 2 +-
 app/views/projects/search.html.erb       | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index cf7e9589..40568905 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -227,8 +227,8 @@ class ProjectsController < ApplicationController
 
   def search
     #modified by nie
-    project_type = params[:project_type]
-    projects_all = (project_type.eql? Project::ProjectType_project) ? Project.project_entities : Project.course_entities
+    project_type = params[:project_type].to_i
+    projects_all = (project_type.eql? Project::ProjectType_course) ? Project.course_entities : Project.project_entities
     @projects = projects_all.visible
     @projects = @projects.visible.like(params[:name]) if params[:name].present? 
     @offset, @limit = api_offset_and_limit({:limit => 10})
diff --git a/app/views/layouts/base_memos.html.erb b/app/views/layouts/base_memos.html.erb
index 4b7f4b96..b033a81c 100644
--- a/app/views/layouts/base_memos.html.erb
+++ b/app/views/layouts/base_memos.html.erb
@@ -33,7 +33,7 @@
 								<td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
 								<td rowspan="2" width="250px">
 									<div class="top-content-search" style="display:none">
-										<%= form_tag(:controller => 'projects', :action => "search", :method => :get) do %>
+										<%= form_tag(projects_search_path, :method => :get) do %>
 										<%= text_field_tag 'name', params[:name], :size => 20 %>
 										<%= hidden_field_tag 'project_type', params[:project_type] %>
 										<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>	
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 1a4ed1b4..7504e575 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -30,7 +30,7 @@
 									<td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
 									<td rowspan="2" width="250px">
 										<div class="top-content-search">
-											<%= form_tag(:controller => 'projects', :action => "search", :method => :get) do %>
+											<%= form_tag(projects_search_path, :method => :get) do %>
 											<%= text_field_tag 'name', params[:name], :size => 20 %>
 											<%= hidden_field_tag 'project_type', params[:project_type] %>
 											<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>	
diff --git a/app/views/projects/course.html.erb b/app/views/projects/course.html.erb
index d7a84f53..1359b8be 100644
--- a/app/views/projects/course.html.erb
+++ b/app/views/projects/course.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <div class="top-content">
-	<%= form_tag(:controller => 'projects', :action => 'search', :method => :get) do %>
+	<%= form_tag(projects_search_path, :method => :get) do %>
 	<table width="940px">
 		<tr>
 			<td class="info_font" style="width: 220px; color: #15bccf"><%= l(:label_course_practice) %></td>
diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb
index 4bc094f7..c4b2bdc9 100644
--- a/app/views/projects/index.html.erb
+++ b/app/views/projects/index.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <div class="top-content">
-	<%= form_tag(:controller => 'projects', :action => "search", :method => :get) do %>
+	<%= form_tag(projects_search_path, :method => :get) do %>
 	<table width="940px">
 		<tr>
 			<td class="info_font" style="width: 220px; color: #15bccf"><%= l(:label_project_deposit) %></td>
diff --git a/app/views/projects/search.html.erb b/app/views/projects/search.html.erb
index 79d21dcb..b1bd3d41 100644
--- a/app/views/projects/search.html.erb
+++ b/app/views/projects/search.html.erb
@@ -2,7 +2,7 @@
 <%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %>
 <% end %>
 <div class="top-content">
-	<%= form_tag(:controller => 'projects', :action => "search", :method => :get) do %>
+	<%= form_tag(projects_search_path, :method => :get) do %>
 	<% if params[:project_type] == "1" %>
 		<table width="940px">
 			<tr>