Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

app/controllers/users_controller.rb

@@ -565,7 +565,7 @@ class UsersController < ApplicationController
   end
   
   def watch_projects
-    @watch_projects = Project.joins(:watchers).where("project_type <>? and watchable_type = ? and user_id = ?", '1','Project', @user.id)
+    @watch_projects = Project.joins(:watchers).where("project_type <>? and watchable_type = ? and watchers.user_id = ?", '1','Project', @user.id)
     @state = 1
     respond_to do |format|
       format.html {

app/views/open_source_projects/_show_bug.html.erb

@@ -2,7 +2,7 @@
 <!--display the board-->
 
 <div class="borad-topic-count" style="margin-top:10px">
-	 <span>共有 <%= link_to memos.count %> 个贴子 </span
+	 <span>共有 <%= link_to @topic_count %> 个贴子 </span
 </div>
 <div style="padding-top: 10px">
 	<% if memos.any? %>
@@ -59,7 +59,7 @@
 					</span></td>
 				</tr> 
 				<tr>
-					<td align="left">帖子来源：<span class="font_lighter" style="color: #068d9c"><%=link_to 'OSChina', topic.url %>
+					<td align="left">帖子来源：<span class="font_lighter" style="color: #068d9c"><%=link_to topic.topic_resource, topic.url %>
 					</span></td>
 					<td colspan="3" align="center"><%= no_use_link(topic, User.current) %> </td>
 				</tr>

app/views/open_source_projects/_show_memo.html.erb

@@ -2,7 +2,7 @@
 <!--display the board-->
 
 <div class="borad-topic-count" style="margin-top:10px">
-	 <span>共有 <%= link_to memos.count %> 个贴子 </span
+	 <span>共有 <%= link_to @topic_count %> 个贴子 </span
 </div>
 <div style="padding-top: 10px">
 	<% if memos.any? %>