[PATCH conductor] BZ 809787 - Fixes untranslated table header
by Matt Wagner
For some reason this table header was never updated to use
strings from en.yml, or even uppercase strings.
Because it's after string freeze, I had to be slightly creative
in fitting things in, so I left a comment suggesting that the
keys I used might need cleanup later.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=809787
but is equally as useful upstream.
---
src/app/controllers/pools_controller.rb | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/app/controllers/pools_controller.rb b/src/app/controllers/pools_controller.rb
index de4d60f..7ae9189 100644
--- a/src/app/controllers/pools_controller.rb
+++ b/src/app/controllers/pools_controller.rb
@@ -128,8 +128,10 @@ class PoolsController < ApplicationController
when 'images'
# this case covers fetching of unique images and constructing
# collection for filter table
- @header = [{:name => "catalog"}, {:name => "deployable"},
- {:name => "image"}, {:name => "provider_image"}]
+ # 19sept2012 -- FIXME - These aren't really the correct translation names, but
+ # this patch is after string freeze so I'm confined to using them. --mawagner
+ @header = [{:name => t("pools.images.catalog")}, {:name => t("catalog_entries.index.catalog_entry")},
+ {:name => t("logs.index.image")}, {:name => t("images.show.providers_image_id")}]
@catalog_images = @pool.catalog_images_collection(
@pool.catalogs.list_for_user(current_session, current_user,
Privilege::VIEW))
--
1.7.7.6
11 years, 7 months
[PATCH conductor] bug 858782: don't rely on User object hooks to create entities
by Scott Seago
https://bugzilla.redhat.com/show_bug.cgi?id=858782
Now that we've changed user login to username, the entities migration
is failing -- since it's using the User model save hook to
set entities, but the model now references the new 'username'
field, which only exists after a later migration.
This patch pulls the save hook logic into the migration itself and
uses the attributes as they existed at the time of this migration.
---
src/db/migrate/20120514131500_create_entities.rb | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/db/migrate/20120514131500_create_entities.rb b/src/db/migrate/20120514131500_create_entities.rb
index 1270ffe..c898120 100644
--- a/src/db/migrate/20120514131500_create_entities.rb
+++ b/src/db/migrate/20120514131500_create_entities.rb
@@ -25,10 +25,18 @@ class CreateEntities < ActiveRecord::Migration
end
User.all.each do |u|
- u.save!
+ unless u.entity
+ entity = Entity.new(:entity_target => u)
+ entity.name = "#{u.first_name} #{u.last_name} (#{u.login})"
+ entity.save!
+ end
end
UserGroup.all.each do |ug|
- ug.save!
+ unless ug.entity
+ entity = Entity.new(:entity_target => ug)
+ entity.name = "#{ug.name} (#{ug.membership_source})"
+ entity.save!
+ end
end
end
--
1.7.11.4
11 years, 7 months
[PATCH conductor] Bug 858253: group members search
by Scott Seago
https://bugzilla.redhat.com/show_bug.cgi?id=858253
Group members search wasn't working -- the UI elements were there but we weren't filtering and weren't providing the necessary controller action.
---
src/app/controllers/user_groups_controller.rb | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/app/controllers/user_groups_controller.rb b/src/app/controllers/user_groups_controller.rb
index 23cac12..4ae4e79 100644
--- a/src/app/controllers/user_groups_controller.rb
+++ b/src/app/controllers/user_groups_controller.rb
@@ -39,7 +39,12 @@ class UserGroupsController < ApplicationController
save_breadcrumb(user_group_path(@user_group), @user_group.name)
@tab_captions = ['Properties']
@details_tab = params[:details_tab].blank? ? 'properties' : params[:details_tab]
- @members = paginate_collection((a)user_group.members, params[:page])
+ @members = paginate_collection((a)user_group.members.
+ apply_filters(:preset_filter_id =>
+ params[:members_preset_filter],
+ :search_filter =>
+ params[:members_search]),
+ params[:page])
add_profile_permissions_inline((a)user_group.entity)
respond_to do |format|
format.html
@@ -242,4 +247,8 @@ class UserGroupsController < ApplicationController
redirect_to_original({"user_groups_preset_filter" => params[:user_groups_preset_filter], "user_groups_search" => params[:user_groups_search]})
end
+ def filter_members
+ redirect_to_original({"members_preset_filter" => params[:members_preset_filter], "members_search" => params[:members_search]})
+ end
+
end
--
1.7.11.4
11 years, 7 months
[NOTICE] Update on github pull request process
by Jason Guiditta
Hello all, just a quick note to let you know that any pull request
submitted to github (currently conductor and aeolus-image) will get
integration tested by travis, and will be noted when complete with the
build status (and a link to the build). This should help speed up
review time, as it will be less necessary to run the entire suite for
every patch review, and increase the chance that we will not break the
build on integration. No patch that breaks the build should be merged,
just to be clear. Anyone breaking this rule will be slapped with a
large wet fish.
-j
11 years, 7 months
[PATCH conductor 0/1] Minor cleanup (upstream-only)
by Matt Wagner
Just a little housekeeping -- this block was no longer necessary, except
for its "@deployment.valid?" line which causes validation to run on the
deployment (obviously). I moved that somewhere more sensible and cleaned
up the rest.
-- Matt
11 years, 7 months
RFC - Updated Notifications Proposal
by Tzu-Mainn Chen
Hi,
I'm looking to do an partial implementation of notifications; to that end, I've updated Matt's excellent notifications proposal:
https://www.aeolusproject.org/redmine/projects/aeolus/wiki/Notification_S...
One additional note: this is partly driven by the fact that one of the items that converge-ui is currently working on is header notifications. I think it'd be useful to have an initial implementation of notifications done by that time, so we can implement and test the UI and provide feedback in a timely manner.
Thanks,
Tzu-Mainn Chen
11 years, 7 months