ACK, All Tests Pass, End to End works
Really nice stuff,
Thanks
Martyn
----- Original Message -----
From: jprovazn(a)redhat.com
To: aeolus-devel(a)lists.fedorahosted.org
Sent: Mon, 21 Feb 2011 07:40:16 -0500 (EST)
Subject: [PATCH conductor 6/7] Display provider name when creating realm mapping
From: Jan Provaznik <jprovazn(a)redhat.com>
---
src/app/models/realm.rb | 4 ++++
src/app/views/admin/realm_mappings/new.haml | 3 ++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/app/models/realm.rb b/src/app/models/realm.rb
index 4c9849b..2b1ea73 100644
--- a/src/app/models/realm.rb
+++ b/src/app/models/realm.rb
@@ -47,4 +47,8 @@ class Realm < ActiveRecord::Base
CONDUCTOR_REALM_PROVIDER_DELIMITER = ":"
CONDUCTOR_REALM_ACCOUNT_DELIMITER = "/"
+
+ def name_with_provider
+ "#{self.provider.name}: #{self.name}"
+ end
end
diff --git a/src/app/views/admin/realm_mappings/new.haml
b/src/app/views/admin/realm_mappings/new.haml
index 26c364f..0861199 100644
--- a/src/app/views/admin/realm_mappings/new.haml
+++ b/src/app/views/admin/realm_mappings/new.haml
@@ -4,6 +4,7 @@
= f.hidden_field :frontend_realm_id
= f.hidden_field :realm_or_provider_type
- = select_tag 'realm_backend_target[realm_or_provider_id]',
options_from_collection_for_select(@backend_targets, 'id', 'name')
+ - label_method = @realm_target.realm_or_provider_type == 'Realm' ?
'name_with_provider' : 'name'
+ = select_tag 'realm_backend_target[realm_or_provider_id]',
options_from_collection_for_select(@backend_targets, 'id', label_method)
%fieldset.clear
= f.submit "Save", :class => "submit formbutton"
--
1.7.4
_______________________________________________
aeolus-devel mailing list
aeolus-devel(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/aeolus-devel