From 02fdf9ba1df61edf6151031338da28fd6eaa0e92 Mon Sep 17 00:00:00 2001 From: "vit.jonas@gmail.com" Date: Wed, 1 Jun 2011 18:53:19 +0000 Subject: [PATCH] * validating paging for revisions git-svn-id: http://redmine-dmsf.googlecode.com/svn/trunk/redmine_dmsf@114 5e329b0b-a2ee-ea63-e329-299493fc886d --- app/controllers/dmsf_controller.rb | 5 +---- app/controllers/dmsf_files_controller.rb | 4 +++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb index 71970a41..a770a125 100644 --- a/app/controllers/dmsf_controller.rb +++ b/app/controllers/dmsf_controller.rb @@ -56,10 +56,7 @@ class DmsfController < ApplicationController @files.reverse! end - respond_to do |format| - format.html { render :layout => !request.xhr? } - format.api - end + render :layout => !request.xhr? end diff --git a/app/controllers/dmsf_files_controller.rb b/app/controllers/dmsf_files_controller.rb index cd4b448f..39de51c7 100644 --- a/app/controllers/dmsf_files_controller.rb +++ b/app/controllers/dmsf_files_controller.rb @@ -55,7 +55,9 @@ class DmsfFilesController < ApplicationController # TODO: line bellow is to handle old instalations with errors in data handling @revision.name = @file.name - @revision_pages = Paginator.new self, @file.revisions.count, 25, params["page"] + @revision_pages = Paginator.new self, @file.revisions.count, params["per_page"] ? params["per_page"].to_i : 25, params["page"] + + render :layout => !request.xhr? end #TODO: don't create revision if nothing change