Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added text (Disabled) next to disabled domain on the right. #3466

Merged
merged 1 commit into from Feb 26, 2018
Merged

Added text (Disabled) next to disabled domain on the right. #3466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/helpers/miq_ae_class_helper.rb
View file
Open in desktop
Expand Up @@ -26,6 +26,8 @@ def domain_display_name_using_name(record, current_domain_name)
domain_name = record.domain.name
if domain_name == current_domain_name
return "#{domain_name} (Same Domain)", nil
elsif !record.domain.enabled
return "#{domain_name} (Disabled)", record.id
else
return domain_name, record.id
end
Expand Down
4 changes: 2 additions & 2 deletions spec/controllers/miq_ae_class_controller_spec.rb
View file
Open in desktop
Expand Up @@ -219,8 +219,8 @@
end

context "get selected Class/Instance/Method record back" do
let(:miq_ae_domain) { double("MiqAeDomain", :name => "yet_another_fqname", :id => 1) }
let(:miq_ae_domain2) { double("MiqAeDomain", :name => "yet_another_fqname2", :id => 2) }
let(:miq_ae_domain) { double("MiqAeDomain", :name => "yet_another_fqname", :id => 1, :enabled => true) }
let(:miq_ae_domain2) { double("MiqAeDomain", :name => "yet_another_fqname2", :id => 2, :enabled => true) }

let(:miq_ae_class) do
double("MiqAeClass",
Expand Down