[PATCH/foreman 1/1] Feature #956 return custom number of reports

Development
1

Signed-off-by: Corey Osman <corey@logicminds.biz>

··· --- app/controllers/reports_controller.rb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index d178991…1278939 100644
— a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -14,8 +14,8 @@ class ReportsController < ApplicationController
def index
values = Report.search_for(params[:search], :order => params[:order])
respond_to do |format|

  •  format.html { @reports = values.paginate :page => params[:page], :include => :host }

  •  format.json { render :json => values.paginate(:page => params[:page], :include => [:host,:logs]) }

  •  format.html { @reports = values.paginate( :page => params[:page], :per_page => params[:numreports],:include => :host) }

  •  format.json { render :json => values.paginate(:page => params[:page], :per_page => params[:numreports], :include => [:host,:logs])}
    end
    rescue => e
    error e.to_s
    –
    1.7.4.1
2

Ohad,

Any chance you can slip this into .3rc?

Corey

··· On Jun 4, 2011, at 1:19 AM, Corey Osman wrote:

Signed-off-by: Corey Osman corey@logicminds.biz

app/controllers/reports_controller.rb | 4 +±-
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index d178991…1278939 100644
— a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -14,8 +14,8 @@ class ReportsController < ApplicationController
def index
values = Report.search_for(params[:search], :order => params[:order])
respond_to do |format|

  •  format.html { @reports = values.paginate :page => params[:page], :include => :host }

  •  format.json { render :json => values.paginate(:page => params[:page], :include => [:host,:logs]) }

  •  format.html { @reports = values.paginate( :page => params[:page], :per_page => params[:numreports],:include => :host) }

  •  format.json { render :json => values.paginate(:page => params[:page], :per_page => params[:numreports], :include => [:host,:logs])}
    end
    rescue => e
    error e.to_s
    –
    1.7.4.1
3

+1

I modified the param to be called per_page (to be consistent) and
cleanup the code a bit to DRY.

Ohad

··· On Sat, 2011-06-04 at 01:19 -0700, Corey Osman wrote: > Signed-off-by: Corey Osman > --- > app/controllers/reports_controller.rb | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb > index d178991..1278939 100644 > --- a/app/controllers/reports_controller.rb > +++ b/app/controllers/reports_controller.rb > @@ -14,8 +14,8 @@ class ReportsController < ApplicationController > def index > values = Report.search_for(params[:search], :order => params[:order]) > respond_to do |format| > - format.html { @reports = values.paginate :page => params[:page], :include => :host } > - format.json { render :json => values.paginate(:page => params[:page], :include => [:host,:logs]) } > + format.html { @reports = values.paginate( :page => params[:page], :per_page => params[:numreports],:include => :host) } > + format.json { render :json => values.paginate(:page => params[:page], :per_page => params[:numreports], :include => [:host,:logs])} > end > rescue => e > error e.to_s