Please review pull request #93: Fix regression opened by (lifton)

Description:

Merge 434b1b3 might have removed some of the changes previously added. Not sure, but this fixes the access control regression.

  • Opened: Tue Mar 20 23:26:36 UTC 2012
  • Based on: puppetlabs:master (2214833d7907ffa673ab5747d35c3b1fb183f58e)
  • Requested merge: lifton:master (f2c3d549523daaf867423ab6e6dc09008b4af428)

Diff follows:

diff --git a/app/views/shared/_node_manager_sidebar_for_type.html.haml b/app/views/shared/_node_manager_sidebar_for_type.html.haml
index 3a3694e..2564c8d 100644
--- a/app/views/shared/_node_manager_sidebar_for_type.html.haml
+++ b/app/views/shared/_node_manager_sidebar_for_type.html.haml
@@ -18,5 +18,5 @@
           = link_to h(entry.name), send(path_for_show, entry)
           %span.count= entry.nodes_count
   .footer.actionbar
-    - unless SETTINGS.enable_read_only_mode
+    - unless SETTINGS.enable_read_only_mode || session['ACCESS_CONTROL_ROLE'] == 'READ_ONLY'
       = link_to "Add #{h(label.downcase)}", send(path_for_new), :class => 'button'

    

--
You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.

Reply via email to