From: Jan Provaznik <[email protected]>
---
src/app/controllers/instance_controller.rb | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/app/controllers/instance_controller.rb
b/src/app/controllers/instance_controller.rb
index 93b413e..fd86e3e 100644
--- a/src/app/controllers/instance_controller.rb
+++ b/src/app/controllers/instance_controller.rb
@@ -56,12 +56,14 @@ class InstanceController < ApplicationController
# FIXME: replace by template_view priv
require_privilege(Privilege::IMAGE_VIEW)
@order_dir = params[:order_dir] == 'desc' ? 'desc' : 'asc'
- @order = params[:order] || 'name'
+ @order = "templates.#{params[:order] || 'name'}"
@templates = Template.paginate(
:page => params[:page] || 1,
:order => @order + ' ' + @order_dir,
- :conditions => {:complete => true}
+ :include => {:images => :replicated_images},
+ :conditions => "replicated_images.uploaded = 't'"
)
+ #:include => {:images => :replicated_images}, :conditions =>
"replicated_images.uploaded = 'f'"
@single_select = true
if request.xhr? and params[:partial]
--
1.7.2.2
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
