[myexperiment-hackers] [3432] trunk/lib/rest.rb: Hide public permission node if private.

[noreply]

Revision

3432

Author

fbacall

Date

2013-02-20 15:43:45 +0000 (Wed, 20 Feb 2013)

Log Message

Hide public permission node if private. Show use-layout field

Modified Paths

• trunk/lib/rest.rb

Diff

Modified: trunk/lib/rest.rb (3431 => 3432)

--- trunk/lib/rest.rb	2013-02-20 15:31:35 UTC (rev 3431)
+++ trunk/lib/rest.rb	2013-02-20 15:43:45 UTC (rev 3432)
@@ -1861,7 +1861,7 @@
 
 def permissions(ob, user, query)
 
-  def permission_node(view, download, edit, category, id = nil)
+  def permission_node(view, download, edit, category, id = nil, layout = false)
     node = LibXML::XML::Node.new('permission')
     category_node = LibXML::XML::Node.new('category')
     category_node << category
@@ -1886,8 +1886,17 @@
       privilege['type'] = "edit"
       node << privilege
     end
+    if layout
+      use_layout_node = LibXML::XML::Node.new('use-layout')
+      use_layout_node << 'true'
+      node << use_layout_node
+    end
 
-    node
+    if view || edit || download
+      node
+    else
+      nil
+    end
   end
 
   permissions = LibXML::XML::Node.new('permissions')
@@ -1897,7 +1906,8 @@
                                  'public')
 
   ob.contribution.policy.permissions.select {|p| p.contributor_type == "Network"}.each do |perm|
-    permissions << permission_node(perm.view, perm.download, perm.edit, 'group', perm.contributor_id)
+    permissions << permission_node(perm.view, perm.download, perm.edit, 'group', perm.contributor_id,
+                                   ob.contribution.policy.layout == perm.contributor.layout_name)
   end
 
   permissions