Merge branch 'master' into starting_retirement_request

ManageIQ · Feb 19, 2018 · d7cbaa5 · d7cbaa5
2 parents 9f123f6 + 02af759
commit d7cbaa5
Show file tree

Hide file tree

Showing 63 changed files with 747 additions and 637 deletions.
diff --git a/Gemfile b/Gemfile
@@ -35,7 +35,7 @@ gem "docker-api",                     "~>1.33.6",      :require => false
 gem "elif",                           "=0.1.0",        :require => false
 gem "fast_gettext",                   "~>1.2.0"
 gem "gettext_i18n_rails",             "~>1.7.2"
-gem "gettext_i18n_rails_js",          "~>1.1.0"
+gem "gettext_i18n_rails_js",          "~>1.3.0"
 gem "hamlit",                         "~>2.7.0"
 gem "highline",                       "~>1.6.21",      :require => false
 gem "inifile",                        "~>3.0",         :require => false

diff --git a/app/models/asset_detail.rb b/app/models/asset_detail.rb
@@ -0,0 +1,7 @@
+class AssetDetail < ApplicationRecord
+  include NewWithTypeStiMixin
+
+  acts_as_miq_taggable
+
+  belongs_to :resource, :polymorphic => true
+end
diff --git a/app/models/asset_details.rb b/app/models/asset_details.rb
diff --git a/app/models/authenticator/httpd.rb b/app/models/authenticator/httpd.rb
@@ -120,7 +120,7 @@ def user_details_from_headers(username, request)
                     :lastname  => request.headers['X-REMOTE-USER-LASTNAME'],
                     :email     => request.headers['X-REMOTE-USER-EMAIL'],
                     :domain    => request.headers['X-REMOTE-USER-DOMAIN']}
-      [user_attrs, (request.headers['X-REMOTE-USER-GROUPS'] || '').split(/[;:,]/)]
+      [user_attrs, (CGI.unescape(request.headers['X-REMOTE-USER-GROUPS'] || '')).split(/[;:,]/)]
     end
 
     def user_attrs_from_external_directory(username)

diff --git a/app/models/ems_refresh/save_inventory_physical_infra.rb b/app/models/ems_refresh/save_inventory_physical_infra.rb
@@ -47,7 +47,7 @@ def save_physical_servers_inventory(ems, hashes, target = nil)
                 []
               end
 
-    child_keys = [:computer_system, :asset_details, :hosts]
+    child_keys = [:computer_system, :asset_detail, :hosts]
     save_inventory_multi(ems.physical_servers, hashes, deletes, [:ems_ref], child_keys)
     store_ids_for_new_records(ems.physical_servers, hashes, :ems_ref)
   end
@@ -69,8 +69,8 @@ def save_customization_scripts_inventory(ems, hashes, target = nil)
   #
   # Saves asset details information of a resource
   #
-  def save_asset_details_inventory(parent, hash)
+  def save_asset_detail_inventory(parent, hash)
     return if hash.nil?
-    save_inventory_single(:asset_details, parent, hash)
+    save_inventory_single(:asset_detail, parent, hash)
   end
 end
diff --git a/app/models/ldap_domain.rb b/app/models/ldap_domain.rb
diff --git a/app/models/ldap_group.rb b/app/models/ldap_group.rb
diff --git a/app/models/ldap_management.rb b/app/models/ldap_management.rb
diff --git a/app/models/ldap_region.rb b/app/models/ldap_region.rb
diff --git a/app/models/ldap_server.rb b/app/models/ldap_server.rb