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

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
sw 2014-07-22 13:49:25 +08:00
parent de17a84061 42c2f6c2ee
commit 47ae398748
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/documents_controller.rb
View File

@ -42,7 +42,8 @@ class DocumentsController < ApplicationController
when 'title' when 'title'
@grouped = documents.group_by {|d| d.title.first.upcase} @grouped = documents.group_by {|d| d.title.first.upcase}
when 'author' when 'author'
@grouped = documents.select{|d| d.attachments.any?}.group_by {|d| d.attachments.last.author} # @grouped = documents.select{|d| d.attachments.any?}.group_by {|d| d.attachments.last.author}
@grouped = documents.group_by {|d| d.user.name }
else else
@grouped = documents.group_by(&:category) @grouped = documents.group_by(&:category)
end end

2
db/schema.rb
View File

@ -11,7 +11,7 @@
# #
# It's strongly recommended to check this file into your version control system. # It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20140721074353) do ActiveRecord::Schema.define(:version => 20140722024513) do
create_table "activities", :force => true do |t| create_table "activities", :force => true do |t|
t.integer "act_id", :null => false t.integer "act_id", :null => false