jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
xianbo 2014-05-27 17:26:24 +08:00
parent 0f56d9e885 200c052bb4
commit a70593ad76
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/users_controller.rb
View File

@ -565,7 +565,7 @@ class UsersController < ApplicationController
end end
def watch_projects 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 @state = 1
respond_to do |format| respond_to do |format|
format.html { format.html {

4
app/views/open_source_projects/_show_bug.html.erb
View File

@ -2,7 +2,7 @@
<!--display the board--> <!--display the board-->
<div class="borad-topic-count" style="margin-top:10px"> <div class="borad-topic-count" style="margin-top:10px">
<span>共有 <%= link_to memos.count %> 个贴子 </span <span>共有 <%= link_to @topic_count %> 个贴子 </span
</div> </div>
<div style="padding-top: 10px"> <div style="padding-top: 10px">
<% if memos.any? %> <% if memos.any? %>
@ -59,7 +59,7 @@
</span></td> </span></td>
</tr> </tr>
<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> </span></td>
<td colspan="3" align="center"><%= no_use_link(topic, User.current) %> </td> <td colspan="3" align="center"><%= no_use_link(topic, User.current) %> </td>
</tr> </tr>

2
app/views/open_source_projects/_show_memo.html.erb
View File

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