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

Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject

This commit is contained in:
huang 2016-10-27 17:30:35 +08:00
parent d42417d9d5 5089d2f9fd
commit 8706d3b791
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/versions_controller.rb
View File

@ -37,13 +37,13 @@ class VersionsController < ApplicationController
type = params[:type]
case type
when nil,"1"
@versions = @project.versions
@versions = @project.versions.reorder('updated_on desc')
when "2"
@versions = @project.versions.where(:status => 'open')
@versions = @project.versions.where(:status => 'open').reorder('updated_on desc')
when "3"
@versions = @project.versions.where(:status => 'locked')
@versions = @project.versions.where(:status => 'locked').reorder('updated_on desc')
when "4"
@versions = @project.versions.where(:status => 'closed')
@versions = @project.versions.where(:status => 'closed').reorder('updated_on desc')
end
@versions_count = Version.where(:project_id => @project.id).count
@versions_open_count = Version.where(:project_id => @project.id, :status => "open").count

2
app/views/projects/_comment_reply_detail.html.erb
View File

@ -1,7 +1,7 @@
<div class="orig_user fl">
<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %>
</div>
<div class="orig_right fl">
<div class="orig_right fl" style="width: 90%">
<%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %>
<span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
<div class="orig_content ">

2
app/views/users/_comment_reply_detail.html.erb
View File

@ -1,7 +1,7 @@
<div class="orig_user fl">
<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %>
</div>
<div class="orig_right fl">
<div class="orig_right fl" style="width: 90%">
<%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %>
<span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
<div class="orig_content ">