Merge pull request #13963 from abellotti/api_reinstating_needed_taggi…

…ng_code Reverting PR# 13684
ManageIQ · Feb 17, 2017 · ee3e7b9 · ee3e7b9
2 parents e464984 + ece7d53
commit ee3e7b9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/app/controllers/api/subcollections/policies.rb b/app/controllers/api/subcollections/policies.rb
@@ -42,7 +42,8 @@ def parse_policy(data, collection, klass)
         guid = data["guid"]
         return klass.find_by(:guid => guid) if guid.present?
 
-        {}
+        href = data["href"]
+        href =~ %r{^.*/#{collection}/#{BaseController::CID_OR_ID_MATCHER}$} ? klass.find(from_cid(href.split('/').last)) : {}
       end
 
       def policy_subcollection_action(ctype, policy)

diff --git a/app/controllers/api/subcollections/tags.rb b/app/controllers/api/subcollections/tags.rb
@@ -98,7 +98,16 @@ def parse_tag(data)
         return {:category => category, :name => name} if category && name
         return tag_path_to_spec(name) if name && name[0] == '/'
 
-        {}
+        parse_tag_from_href(data)
+      end
+
+      def parse_tag_from_href(data)
+        href = data["href"]
+        tag  = if href && href.match(%r{^.*/tags/#{BaseController::CID_OR_ID_MATCHER}$})
+                 klass = collection_class(:tags)
+                 klass.find(from_cid(href.split('/').last))
+               end
+        tag.present? ? tag_path_to_spec(tag.name).merge(:id => tag.id) : {}
       end
 
       def tag_path_to_spec(path)