[myexperiment-hackers] [3754] trunk/lib/rest.rb: Added id attribute to resource elements in REST API

[noreply]

Revision

3754

Author

fbacall

Date

2013-10-14 08:36:55 +0000 (Mon, 14 Oct 2013)

Log Message

Added id attribute to resource elements in REST API

Modified Paths

• trunk/lib/rest.rb

Diff

Modified: trunk/lib/rest.rb (3753 => 3754)

--- trunk/lib/rest.rb	2013-10-08 15:40:31 UTC (rev 3753)
+++ trunk/lib/rest.rb	2013-10-14 08:36:55 UTC (rev 3754)
@@ -229,6 +229,7 @@
 
               item_attrs['resource'] = item_uri if item_uri && query["show-resource"] != "no"
               item_attrs['uri'] = rest_access_uri(item) if query["show-uri"] != "no"
+              item_attrs['id'] = item.id.to_s if query["show-id"] != "no"
 
               item_attrs.each do |key,value|
                 el[key] = value
@@ -297,6 +298,7 @@
           resource_uri = rest_resource_uri(item)
           el['resource'] = resource_uri if resource_uri && query["show-resource"] != "no"
           el['uri'] = rest_access_uri(item) if query["show-uri"] != "no"
+          el['id'] = item.id.to_s if query["show-id"] != "no"
           el << item.label if item.respond_to?(:label) && item.label
         end
 
@@ -368,6 +370,7 @@
 
   entity['uri'     ] = uri      if uri && query["show-uri"] != "no"
   entity['resource'] = resource if resource && query["show-resource"] != "no"
+  entity['id'] = ob.id.to_s if query["show-id"] != "no"
   entity['version' ] = version  if version && query["show-version"] != "no"
 
   TABLES['Model'][:data][rest_entity]['REST Attribute'].each do |rest_attribute|
@@ -826,6 +829,7 @@
 
   el['resource'] = resource_uri if resource_uri && query["show-resource"] != "no"
   el['uri'     ] = rest_access_uri(ob) if query["show-uri"] != "no"
+  el['id'] = ob.id.to_s if query["show-id"] != "no"
   el['version' ] = ob.current_version.to_s if ob.respond_to?('current_version') && query["show-version"] != "no"
 
   el << rest_object_label_text(ob) if !skip_text
@@ -1260,6 +1264,7 @@
   unless ob.is_a?(Policy)
     permissions['uri'] = rest_access_uri(policy)
     permissions['resource'] = rest_resource_uri(policy)
+    permissions['id'] = policy.id.to_s
     permissions['policy-type'] = policy.group_policy? ? 'group' : 'user-specified'
   end