6:31 a.m.
New subject: [PATCH conductor 1/2] Fix Conductor.Views.PoolsIndex in case no deployment rendered
From: Imre Farkas <ifarkas(a)redhat.com>
---
src/app/views/pools/_pretty_list.html.haml | 2 +-
src/public/javascripts/backbone/views.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/views/pools/_pretty_list.html.haml
b/src/app/views/pools/_pretty_list.html.haml
index c487c75..02ef6f2 100644
--- a/src/app/views/pools/_pretty_list.html.haml
+++ b/src/app/views/pools/_pretty_list.html.haml
@@ -2,7 +2,7 @@
%h2=t 'pools.index.your_pools'
%span.label.badge.dark.count= @pools.length
-.content
+.content#pools-list
- @pools.each do |pool|
%div.pool.overview{:id => ['pool', pool.id], :class =>
('collapsed' unless pool.deployments.count > 0)}
%header
diff --git a/src/public/javascripts/backbone/views.js
b/src/public/javascripts/backbone/views.js
index 3133b7d..2d6da0d 100644
--- a/src/public/javascripts/backbone/views.js
+++ b/src/public/javascripts/backbone/views.js
@@ -8,7 +8,7 @@ Conductor.Views.PoolsIndex = Backbone.View.extend({
if ($('form.filterable-data').length > 0) {
return 'table'
}
- else if ($('.deployment-array').length > 0) {
+ else if ($('#pools-list').length > 0) {
return 'pretty'
}
},
--
1.7.6.5
6:31 a.m.
New subject: [PATCH conductor 2/2] Adding persmission filter when displaying deployment
From: Imre Farkas <ifarkas(a)redhat.com>
---
src/app/controllers/pools_controller.rb | 3 ++-
src/app/models/pool.rb | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/app/controllers/pools_controller.rb
b/src/app/controllers/pools_controller.rb
index 2d587f6..f53bfdb 100644
--- a/src/app/controllers/pools_controller.rb
+++ b/src/app/controllers/pools_controller.rb
@@ -1,4 +1,5 @@
#
+#
# Copyright 2011 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -105,7 +106,7 @@ class PoolsController < ApplicationController
respond_to do |format|
format.html { render :action => :show}
format.js { render :partial => @view }
- format.json { render :json => @pool.as_json(:with_deployments => true) }
+ format.json { render :json => @pool.as_json(:with_deployments => true,
:current_user => current_user) }
end
end
diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb
index b1fc41e..be3d156 100644
--- a/src/app/models/pool.rb
+++ b/src/app/models/pool.rb
@@ -123,7 +123,7 @@ class Pool < ActiveRecord::Base
})
if options[:with_deployments]
- result[:deployments] = deployments.map {|d| d.as_json}
+ result[:deployments] = deployments.list_for_user(options[:current_user],
Privilege::VIEW).map {|d| d.as_json}
end
result
--
1.7.6.5
8:54 a.m.
On 02/23/2012 01:31 PM, ifarkas(a)redhat.com wrote:
ACK
4450
days inactive
4450
days old
aeolus-devel@lists.fedorahosted.org
3 comments
2 participants
participants (2)
-
Imre Farkas -
Tomas Sedovic