From: Jan Provaznik jprovazn@redhat.com
https://bugzilla.redhat.com/show_bug.cgi?id=649843 --- src/app/controllers/templates_controller.rb | 17 +++++++++++------ src/app/views/templates/builds.haml | 8 ++++---- 2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/app/controllers/templates_controller.rb b/src/app/controllers/templates_controller.rb index 8261eab..55e41c9 100644 --- a/src/app/controllers/templates_controller.rb +++ b/src/app/controllers/templates_controller.rb @@ -11,12 +11,10 @@ class TemplatesController < ApplicationController def index # TODO: add template permission check require_privilege(Privilege::IMAGE_VIEW) - @order_dir = params[:order_dir] == 'desc' ? 'desc' : 'asc' - @order_field = params[:order_field] || 'name' @templates = Template.find( :all, :include => :images, - :order => @order_field + ' ' + @order_dir + :order => get_order('name') ) end
@@ -222,9 +220,10 @@ add account on <a href="#{url_for :controller => 'provider', \ end
def builds - @running_images = Image.all(:include => :template, :conditions => ['status IN (?)', Image::ACTIVE_STATES]) - @completed_images = Image.all(:include => :template, :conditions => {:status => Image::STATE_COMPLETE}) - @failed_images = Image.all(:include => :template, :conditions => {:status => Image::STATE_FAILED}) + order = get_order('templates.name') + @running_images = Image.all(:include => :template, :conditions => ['status IN (?)', Image::ACTIVE_STATES], :order => order) + @completed_images = Image.all(:include => :template, :conditions => {:status => Image::STATE_COMPLETE}, :order => order) + @failed_images = Image.all(:include => :template, :conditions => {:status => Image::STATE_FAILED}, :order => order) require_privilege(Privilege::IMAGE_VIEW) end
@@ -260,6 +259,12 @@ add account on <a href="#{url_for :controller => 'provider', \
private
+ def get_order(default) + @order_dir = params[:order_dir] == 'desc' ? 'desc' : 'asc' + @order_field = params[:order_field] || default + "#{@order_field} #{@order_dir}" + end + def flash_error(msg) flash.now[:error] ||= {} flash.now[:error][:summary] = 'Error while trying to build image' diff --git a/src/app/views/templates/builds.haml b/src/app/views/templates/builds.haml index e265634..0d2d5ce 100644 --- a/src/app/views/templates/builds.haml +++ b/src/app/views/templates/builds.haml @@ -1,8 +1,8 @@ - columns = [ | - {:name => 'NAME', :sort_attr => 'template.name'}, | - {:name => 'OS', :sort_attr => 'template.platform'}, | - {:name => 'VERSION', :sort_attr => 'template.platform_version'}, | - {:name => 'ARCH', :sort_attr => 'template.architecture'}, | + {:name => 'NAME', :sort_attr => 'templates.name'}, | + {:name => 'OS', :sort_attr => 'templates.platform'}, | + {:name => 'VERSION', :sort_attr => 'templates.platform_version'}, | + {:name => 'ARCH', :sort_attr => 'templates.architecture'}, | {:name => 'STATUS', :sort_attr => 'status'}, | ] |