redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* removed sorting control from DmsfControler (done now on client)

Browse Source 
git-svn-id: http://redmine-dmsf.googlecode.com/svn/trunk/redmine_dmsf@170 5e329b0b-a2ee-ea63-e329-299493fc886d
This commit is contained in:
vit.jonas@gmail.com 2011-06-17 12:46:17 +00:00
parent ef63b27b6c
commit ee009c4986
1 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/controllers/dmsf_controller.rb
View File

@ -24,13 +24,7 @@ class DmsfController < ApplicationController
before_filter :find_folder, :except => [:new, :create, :edit_root, :save_root] before_filter :find_folder, :except => [:new, :create, :edit_root, :save_root]
before_filter :find_parent, :only => [:new, :create] before_filter :find_parent, :only => [:new, :create]
helper :sort
include SortHelper
def show def show
sort_init ["title", "asc"]
sort_update ["title", "size", "modified", "version", "author"]
if @folder.nil? if @folder.nil?
@subfolders = DmsfFolder.project_root_folders(@project) @subfolders = DmsfFolder.project_root_folders(@project)
@files = DmsfFile.project_root_files(@project) @files = DmsfFile.project_root_files(@project)
@ -40,24 +34,8 @@ class DmsfController < ApplicationController
end end
@files.sort! do |a,b| @files.sort! do |a,b|
case @sort_criteria.first_key a.last_revision.title <=> b.last_revision.title
when "size" then a.last_revision.size <=> b.last_revision.size
when "modified" then a.last_revision.updated_at <=> b.last_revision.updated_at
when "version" then
result = a.last_revision.major_version <=> b.last_revision.major_version
result == 0 ? a.last_revision.minor_version <=> b.last_revision.minor_version : result
when "author" then a.last_revision.user <=> b.last_revision.user
else a.last_revision.title <=> b.last_revision.title
end
end end
if !@sort_criteria.first_asc?
@subfolders.reverse!
@files.reverse!
end
render :layout => !request.xhr?
end end
def entries_operation def entries_operation