From ee009c4986ce17b5dd1417691465762bc4e59257 Mon Sep 17 00:00:00 2001 From: "vit.jonas@gmail.com" Date: Fri, 17 Jun 2011 12:46:17 +0000 Subject: [PATCH] * removed sorting control from DmsfControler (done now on client) git-svn-id: http://redmine-dmsf.googlecode.com/svn/trunk/redmine_dmsf@170 5e329b0b-a2ee-ea63-e329-299493fc886d --- app/controllers/dmsf_controller.rb | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb index 422108d6..2173a50b 100644 --- a/app/controllers/dmsf_controller.rb +++ b/app/controllers/dmsf_controller.rb @@ -24,13 +24,7 @@ class DmsfController < ApplicationController before_filter :find_folder, :except => [:new, :create, :edit_root, :save_root] before_filter :find_parent, :only => [:new, :create] - helper :sort - include SortHelper - def show - sort_init ["title", "asc"] - sort_update ["title", "size", "modified", "version", "author"] - if @folder.nil? @subfolders = DmsfFolder.project_root_folders(@project) @files = DmsfFile.project_root_files(@project) @@ -40,24 +34,8 @@ class DmsfController < ApplicationController end @files.sort! do |a,b| - case @sort_criteria.first_key - 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 + a.last_revision.title <=> b.last_revision.title end - - if !@sort_criteria.first_asc? - @subfolders.reverse! - @files.reverse! - end - - render :layout => !request.xhr? - end def entries_operation