RubyGems - cbac - Versions diffs - 0.6.2 → 0.6.3 - Mend

cbac 0.6.2 → 0.6.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (71) hide show

data/Manifest +71 -70
data/README.rdoc +51 -51
data/Rakefile +39 -39
data/cbac.gemspec +30 -30
data/config/cbac/context_roles.rb +21 -21
data/config/cbac/privileges.rb +50 -50
data/context_roles.rb +21 -21
data/init.rb +3 -3
data/lib/cbac.rb +132 -132
data/lib/cbac/cbac_pristine/pristine.rb +138 -138
data/lib/cbac/cbac_pristine/pristine_file.rb +179 -173
data/lib/cbac/cbac_pristine/pristine_permission.rb +205 -205
data/lib/cbac/cbac_pristine/pristine_role.rb +43 -42
data/lib/cbac/config.rb +9 -9
data/lib/cbac/context_role.rb +27 -27
data/lib/cbac/generic_role.rb +7 -6
data/lib/cbac/known_permission.rb +15 -14
data/lib/cbac/membership.rb +3 -3
data/lib/cbac/permission.rb +5 -5
data/lib/cbac/privilege.rb +117 -117
data/lib/cbac/privilege_new_api.rb +56 -56
data/lib/cbac/privilege_set.rb +29 -29
data/lib/cbac/privilege_set_record.rb +6 -6
data/lib/cbac/setup.rb +37 -37
data/lib/generators/cbac/USAGE +33 -33
data/lib/generators/cbac/cbac_generator.rb +75 -75
data/lib/generators/cbac/copy_files/config/cbac.pristine +2 -2
data/lib/generators/cbac/copy_files/config/context_roles.rb +17 -17
data/lib/generators/cbac/copy_files/config/privileges.rb +25 -25
data/lib/generators/cbac/copy_files/controllers/generic_roles_controller.rb +30 -30
data/lib/generators/cbac/copy_files/controllers/memberships_controller.rb +22 -22
data/lib/generators/cbac/copy_files/controllers/permissions_controller.rb +61 -61
data/lib/generators/cbac/copy_files/controllers/upgrade_controller.rb +23 -23
data/lib/generators/cbac/copy_files/fixtures/cbac_generic_roles.yml +9 -9
data/lib/generators/cbac/copy_files/fixtures/cbac_memberships.yml +8 -8
data/lib/generators/cbac/copy_files/fixtures/cbac_permissions.yml +8 -8
data/lib/generators/cbac/copy_files/initializers/cbac_config.rb +4 -4
data/lib/generators/cbac/copy_files/migrate/create_cbac_from_scratch.rb +59 -59
data/lib/generators/cbac/copy_files/migrate/create_cbac_upgrade_path.rb +40 -40
data/lib/generators/cbac/copy_files/stylesheets/cbac.css +65 -65
data/lib/generators/cbac/copy_files/tasks/cbac.rake +345 -345
data/lib/generators/cbac/copy_files/views/generic_roles/index.html.erb +58 -58
data/lib/generators/cbac/copy_files/views/layouts/cbac.html.erb +18 -18
data/lib/generators/cbac/copy_files/views/memberships/_update.html.erb +11 -11
data/lib/generators/cbac/copy_files/views/memberships/index.html.erb +23 -23
data/lib/generators/cbac/copy_files/views/permissions/_update_context_role.html.erb +11 -11
data/lib/generators/cbac/copy_files/views/permissions/_update_generic_role.html.erb +11 -11
data/lib/generators/cbac/copy_files/views/permissions/index.html.erb +39 -39
data/lib/generators/cbac/copy_files/views/upgrade/index.html.erb +31 -31
data/migrations/20110211105533_add_pristine_files_to_cbac_upgrade_path.rb +16 -16
data/privileges.rb +50 -50
data/spec/cbac_pristine_file_spec.rb +329 -329
data/spec/cbac_pristine_permission_spec.rb +358 -358
data/spec/cbac_pristine_role_spec.rb +85 -85
data/spec/rcov.opts +1 -1
data/spec/spec.opts +4 -4
data/spec/spec_helper.rb +11 -11
data/tasks/cbac.rake +345 -345
data/test/db/test.sqlite3 +0 -0
data/test/fixtures/cbac_generic_roles.yml +9 -9
data/test/fixtures/cbac_memberships.yml +8 -8
data/test/fixtures/cbac_permissions.yml +14 -14
data/test/fixtures/cbac_privilege_set.yml +18 -18
data/test/test_cbac_actions.rb +71 -71
data/test/test_cbac_authorize_context_roles.rb +39 -39
data/test/test_cbac_authorize_generic_roles.rb +36 -36
data/test/test_cbac_context_role.rb +50 -50
data/test/test_cbac_privilege.rb +151 -151
data/test/test_cbac_privilege_set.rb +50 -50
data/test/test_helper.rb +28 -28
metadata +33 -49

data/lib/generators/cbac/copy_files/views/generic_roles/index.html.erb CHANGED

@@ -1,59 +1,59 @@
-<div class="cbac">
-  <h1>Generic roles</h1>
-  <table>
-    <tr>
-      <th class="medium">Name</th>
-      <th class="large">Remarks</th>
-      <th class="small">&nbsp;</th>
-    </tr>
-    <% Cbac::GenericRole.find(:all).each do |role| %>
-      <tr class="row">
-        <% form_for role do |r| %>
-          <td class="medium"><%= r.text_field :name %></td>
-          <td class="large"><%= r.text_field :remarks, :rows => 1 %></td>
-          <td class="small"><%= r.submit "OK" %></td>
-        <% end %>
-      </tr>
-    <% end%>
-  </table>
-  <div class="linebreak"></div>
-  <table>
-    <% form_for(Cbac::GenericRole.new) do |new_role| %>
-      <tr class="row">
-        <th colspan="2">New generic role</th>
-      </tr>
-      <tr class="row">
-        <td class="medium">Name</td>
-        <td class="medium"><%= new_role.text_field :name %></td>
-      </tr>
-      <tr class="row">
-        <td class="medium">Remarks</td>
-        <td class="large"><%= new_role.text_field :remarks %></td>
-      </tr>
-      <tr class="row">
-        <td colspan="2" class="submit"><%= new_role.submit "Create" %></td>
-      </tr>
-    <% end %>
-  </table>
-  <div class="linebreak"></div>
-  <table>
-    <% form_tag(:controller => "cbac/generic_roles", :action => "delete") do |f| %>
-      <tr>
-        <th colspan="2">Delete generic role</th>
-      </tr>
-      <tr>
-        <td class="medium">Select role</td>
-        <td class="medium"><%= select_tag "id", Cbac::GenericRole.find(:all).collect{|role|"<option value='#{role.id}'>#{role.name}</option>"} %>
-        </td>
-      </tr>
-      <tr>
-        <td colspan="2" class="submit"><%= submit_tag "Delete" %></td>
-      </tr>
-    <% end %>
-  </table>
+<div class="cbac">
+  <h1>Generic roles</h1>
+  <table>
+    <tr>
+      <th class="medium">Name</th>
+      <th class="large">Remarks</th>
+      <th class="small">&nbsp;</th>
+    </tr>
+    <% Cbac::GenericRole.find(:all).each do |role| %>
+      <tr class="row">
+        <% form_for role do |r| %>
+          <td class="medium"><%= r.text_field :name %></td>
+          <td class="large"><%= r.text_field :remarks, :rows => 1 %></td>
+          <td class="small"><%= r.submit "OK" %></td>
+        <% end %>
+      </tr>
+    <% end%>
+  </table>
+  <div class="linebreak"></div>
+  <table>
+    <% form_for(Cbac::GenericRole.new) do |new_role| %>
+      <tr class="row">
+        <th colspan="2">New generic role</th>
+      </tr>
+      <tr class="row">
+        <td class="medium">Name</td>
+        <td class="medium"><%= new_role.text_field :name %></td>
+      </tr>
+      <tr class="row">
+        <td class="medium">Remarks</td>
+        <td class="large"><%= new_role.text_field :remarks %></td>
+      </tr>
+      <tr class="row">
+        <td colspan="2" class="submit"><%= new_role.submit "Create" %></td>
+      </tr>
+    <% end %>
+  </table>
+  <div class="linebreak"></div>
+  <table>
+    <% form_tag(:controller => "cbac/generic_roles", :action => "delete") do |f| %>
+      <tr>
+        <th colspan="2">Delete generic role</th>
+      </tr>
+      <tr>
+        <td class="medium">Select role</td>
+        <td class="medium"><%= select_tag "id", Cbac::GenericRole.find(:all).collect{|role|"<option value='#{role.id}'>#{role.name}</option>"} %>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2" class="submit"><%= submit_tag "Delete" %></td>
+      </tr>
+    <% end %>
+  </table>
 </div>

data/lib/generators/cbac/copy_files/views/layouts/cbac.html.erb CHANGED

@@ -1,18 +1,18 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
-    <title>Context Based Access Control</title>
-    <%= javascript_include_tag :defaults %>
-    <%= stylesheet_link_tag "cbac" %>
-  </head>
-  <body>
-    <%= link_to "Permissions", cbac_permissions_path %>
-    <%= link_to "Generic roles", cbac_generic_roles_path %>
-    <%= link_to "Memberships", cbac_memberships_path %>
-    <%= link_to "Upgrade", cbac_upgrade_path %>
-    <%= yield %>
-  </body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+    <title>Context Based Access Control</title>
+    <%= javascript_include_tag :defaults %>
+    <%= stylesheet_link_tag "cbac" %>
+  </head>
+  <body>
+    <%= link_to "Permissions", cbac_permissions_path %>
+    <%= link_to "Generic roles", cbac_generic_roles_path %>
+    <%= link_to "Memberships", cbac_memberships_path %>
+    <%= link_to "Upgrade", cbac_upgrade_path %>
+    <%= yield %>
+  </body>
+</html>

data/lib/generators/cbac/copy_files/views/memberships/_update.html.erb CHANGED

@@ -1,12 +1,12 @@
-<% update_name = generic_role.id.to_s + "__" + user_id.to_s %>
-<% unless update_partial %><div id="<%= update_name %>"><% end %>
-  <% form_for "/cbac/memberships/update", :remote => true, :url => {:controller => "cbac/memberships", :action => "update"},
-    :update => update_name, :before => "$('#{update_name}').style.visibility = 'hidden';",
-    :complete => "$('#{update_name}').style.visibility = 'visible';" do %>
-    <%= hidden_field_tag "generic_role_id" + update_name, generic_role.id.to_s, :name => "generic_role_id" %>
-    <%= hidden_field_tag "user_id" + update_name, user_id.to_s, :name => "user_id" %>
-    <%= check_box_tag "member" + update_name, "1",
-      (Cbac::Membership.find(:all, :conditions => ["generic_role_id = ? AND user_id = ?", generic_role.id.to_s, user_id.to_s]).length > 0),
-      {:onclick => "this.form.onsubmit();", :name => "member"}%>
-  <% end %>
+<% update_name = generic_role.id.to_s + "__" + user_id.to_s %>
+<% unless update_partial %><div id="<%= update_name %>"><% end %>
+  <% form_for "/cbac/memberships/update", :remote => true, :url => {:controller => "cbac/memberships", :action => "update"},
+    :update => update_name, :before => "$('#{update_name}').style.visibility = 'hidden';",
+    :complete => "$('#{update_name}').style.visibility = 'visible';" do %>
+    <%= hidden_field_tag "generic_role_id" + update_name, generic_role.id.to_s, :name => "generic_role_id" %>
+    <%= hidden_field_tag "user_id" + update_name, user_id.to_s, :name => "user_id" %>
+    <%= check_box_tag "member" + update_name, "1",
+      (Cbac::Membership.find(:all, :conditions => ["generic_role_id = ? AND user_id = ?", generic_role.id.to_s, user_id.to_s]).length > 0),
+      {:onclick => "this.form.onsubmit();", :name => "member"}%>
+  <% end %>
 <% unless update_partial %></div><% end %>

data/lib/generators/cbac/copy_files/views/memberships/index.html.erb CHANGED

@@ -1,23 +1,23 @@
-<div class="cbac">
-  <h1>Memberships</h1>
-  <table>
-    <tr>
-      <th class="medium">Users</th>
-      <% @generic_roles.each do |role| %>
-        <th><%= role.name %></th>
-      <% end %>
-    </tr>
-    <% (@users.sort do |x,y| x.name.downcase <=> y.name.downcase end).each do |u| %>
-      <tr>
-<%- # TODO: documentation must contain something on users having the 'name' method/ field %>
-        <td><%= u.name %></td>
-        <% @generic_roles.each do |generic_role| %>
-          <td class="checked">
-            <%= render :partial => "cbac/memberships/update.html", :locals => {:generic_role => generic_role,
-              :user_id => u.id.to_s,:update_partial => false} %>
-          </td>
-        <% end %>
-      </tr>
-    <% end %>
-  </table>
-</div>
+<div class="cbac">
+  <h1>Memberships</h1>
+  <table>
+    <tr>
+      <th class="medium">Users</th>
+      <% @generic_roles.each do |role| %>
+        <th><%= role.name %></th>
+      <% end %>
+    </tr>
+    <% (@users.sort do |x,y| x.name.downcase <=> y.name.downcase end).each do |u| %>
+      <tr>
+<%- # TODO: documentation must contain something on users having the 'name' method/ field %>
+        <td><%= u.name %></td>
+        <% @generic_roles.each do |generic_role| %>
+          <td class="checked">
+            <%= render :partial => "cbac/memberships/update.html", :locals => {:generic_role => generic_role,
+              :user_id => u.id.to_s,:update_partial => false} %>
+          </td>
+        <% end %>
+      </tr>
+    <% end %>
+  </table>
+</div>

data/lib/generators/cbac/copy_files/views/permissions/_update_context_role.html.erb CHANGED

@@ -1,12 +1,12 @@
-<% update_name = "cr__" + context_role.to_s + "__" + set_id.to_s %>
-<% unless update_partial %><div id="<%= update_name %>"><% end %>
-  <% form_for "/cbac/permissions/update", :remote => true, :url => cbac_permissions_update_path,
-    :update => update_name, :before => "$('#{update_name}').style.visibility = 'hidden';",
-    :complete => "$('#{update_name}').style.visibility = 'visible';" do %>
-    <%= hidden_field_tag "context_role" + update_name, context_role.to_s, :name => "context_role" %>
-    <%= hidden_field_tag "privilege_set_id" + update_name, set_id.to_s, :name => "privilege_set_id" %>
-    <%= check_box_tag "permission" + update_name, "1",
-      (Cbac::Permission.find(:all, :conditions => ["context_role = ? AND privilege_set_id = ?", context_role.to_s, set_id.to_s]).length > 0),
-      {:onclick => "this.form.onsubmit();", :name => "permission"}%>
-  <% end %>
+<% update_name = "cr__" + context_role.to_s + "__" + set_id.to_s %>
+<% unless update_partial %><div id="<%= update_name %>"><% end %>
+  <% form_for "/cbac/permissions/update", :remote => true, :url => cbac_permissions_update_path,
+    :update => update_name, :before => "$('#{update_name}').style.visibility = 'hidden';",
+    :complete => "$('#{update_name}').style.visibility = 'visible';" do %>
+    <%= hidden_field_tag "context_role" + update_name, context_role.to_s, :name => "context_role" %>
+    <%= hidden_field_tag "privilege_set_id" + update_name, set_id.to_s, :name => "privilege_set_id" %>
+    <%= check_box_tag "permission" + update_name, "1",
+      (Cbac::Permission.find(:all, :conditions => ["context_role = ? AND privilege_set_id = ?", context_role.to_s, set_id.to_s]).length > 0),
+      {:onclick => "this.form.onsubmit();", :name => "permission"}%>
+  <% end %>
 <% unless update_partial %></div><% end %>

data/lib/generators/cbac/copy_files/views/permissions/_update_generic_role.html.erb CHANGED

@@ -1,12 +1,12 @@
-<% update_name = "gr__" + role.id.to_s + "__" + set_id.to_s %>
-<% unless update_partial %><div id="<%= update_name %>"><% end %>
-  <% form_for "/cbac/permissions/update", :remote => true, :url => cbac_permissions_update_path,
-    :update => update_name, :before => "$('#{update_name}').style.visibility = 'hidden';",
-    :complete => "$('#{update_name}').style.visibility = 'visible';" do %>
-    <%= hidden_field_tag "generic_role_id" + update_name, role.id.to_s, :name => "generic_role_id" %>
-    <%= hidden_field_tag "privilege_set_id" + update_name, set_id.to_s, :name => "privilege_set_id" %>
-    <%= check_box_tag "permission" + update_name, "1",
-      (Cbac::Permission.find(:all, :conditions => ["generic_role_id = ? AND privilege_set_id = ?", role.id.to_s, set_id.to_s]).length > 0),
-      {:onclick => "this.form.onsubmit();", :name => "permission"}%>
-  <% end %>
+<% update_name = "gr__" + role.id.to_s + "__" + set_id.to_s %>
+<% unless update_partial %><div id="<%= update_name %>"><% end %>
+  <% form_for "/cbac/permissions/update", :remote => true, :url => cbac_permissions_update_path,
+    :update => update_name, :before => "$('#{update_name}').style.visibility = 'hidden';",
+    :complete => "$('#{update_name}').style.visibility = 'visible';" do %>
+    <%= hidden_field_tag "generic_role_id" + update_name, role.id.to_s, :name => "generic_role_id" %>
+    <%= hidden_field_tag "privilege_set_id" + update_name, set_id.to_s, :name => "privilege_set_id" %>
+    <%= check_box_tag "permission" + update_name, "1",
+      (Cbac::Permission.find(:all, :conditions => ["generic_role_id = ? AND privilege_set_id = ?", role.id.to_s, set_id.to_s]).length > 0),
+      {:onclick => "this.form.onsubmit();", :name => "permission"}%>
+  <% end %>
 <% unless update_partial %></div><% end %>

data/lib/generators/cbac/copy_files/views/permissions/index.html.erb CHANGED

@@ -1,39 +1,39 @@
-<div class="cbac">
-  <h2>Subset:</h2>
-  <form action="<%= request.request_uri %>" method="get" name="subset_view_form">
-    <b>Privilege set</b> starts with: <input type="text" name="priv_substr" value="<%= params[:priv_substr] %>" /><br />
-    <b>Role</b> starts with: <input type="text" name="role_substr" value="<%= params[:role_substr] %>" /><br/>
-    <input type="submit" value="Submit" />
-  </form>
-  <h1>Permissions</h1>
-  <table>
-    <tr>
-      <th>Privilegeset</th>
-      <% (@context_roles.sort { |x, y| x[0].to_s <=> y[0].to_s }).each do |name, comment| %>
-        <th><%= name %></th>
-      <% end %>
-      <% (@generic_roles.sort { |x, y| x.name <=> y.name }).each do |role| %>
-        <th><%= role.name %></th>
-      <% end %>
-    </tr>
-    <% (@sets.sort do |x,y| x[0].to_s <=> y[0].to_s end).each do |token, set| %>
-      <tr>
-        <td><span title ="<%= set.comment %>"><%= set.name %></span></td>
-        <% (@context_roles.sort { |x, y| x[0].to_s <=> y[0].to_s }).each do |context_role, comment| %>
-          <td class="checked">
-            <%= render :partial => "cbac/permissions/update_context_role.html", :locals => {:context_role => context_role.to_s,
-              :set_id => set.id.to_s, :update_partial => false} %>
-          </td>
-        <% end %>
-        <% (@generic_roles.sort { |x, y| x.name <=> y.name }).each do |role| %>
-          <td class="checked">
-            <%= render :partial => "cbac/permissions/update_generic_role.html", :locals => {:role => role,
-              :set_id => set.id.to_s, :update_partial => false} %>
-          </td>
-        <% end %>
-      </tr>
-    <% end %>
-  </table>
-</div>
+<div class="cbac">
+  <h2>Subset:</h2>
+  <form action="<%= request.request_uri %>" method="get" name="subset_view_form">
+    <b>Privilege set</b> starts with: <input type="text" name="priv_substr" value="<%= params[:priv_substr] %>" /><br />
+    <b>Role</b> starts with: <input type="text" name="role_substr" value="<%= params[:role_substr] %>" /><br/>
+    <input type="submit" value="Submit" />
+  </form>
+  <h1>Permissions</h1>
+  <table>
+    <tr>
+      <th>Privilegeset</th>
+      <% (@context_roles.sort { |x, y| x[0].to_s <=> y[0].to_s }).each do |name, comment| %>
+        <th><%= name %></th>
+      <% end %>
+      <% (@generic_roles.sort { |x, y| x.name <=> y.name }).each do |role| %>
+        <th><%= role.name %></th>
+      <% end %>
+    </tr>
+    <% (@sets.sort do |x,y| x[0].to_s <=> y[0].to_s end).each do |token, set| %>
+      <tr>
+        <td><span title ="<%= set.comment %>"><%= set.name %></span></td>
+        <% (@context_roles.sort { |x, y| x[0].to_s <=> y[0].to_s }).each do |context_role, comment| %>
+          <td class="checked">
+            <%= render :partial => "cbac/permissions/update_context_role.html", :locals => {:context_role => context_role.to_s,
+              :set_id => set.id.to_s, :update_partial => false} %>
+          </td>
+        <% end %>
+        <% (@generic_roles.sort { |x, y| x.name <=> y.name }).each do |role| %>
+          <td class="checked">
+            <%= render :partial => "cbac/permissions/update_generic_role.html", :locals => {:role => role,
+              :set_id => set.id.to_s, :update_partial => false} %>
+          </td>
+        <% end %>
+      </tr>
+    <% end %>
+  </table>
+</div>

data/lib/generators/cbac/copy_files/views/upgrade/index.html.erb CHANGED

@@ -1,32 +1,32 @@
-<div class="cbac">
-  <h1>Permissions: available upgrades</h1>
-  <span>Choose which of these available permissions you want to accept or reject.
-    Each upgrade either adds a new permission or revokes an existing permission.
-    You can also leave the available upgrade for another time.</span><br/><br/>
-  <% form_tag cbac_upgrade_update_path  do %>
-  <table>
-    <tr>
-      <th class="medium">Add /revoke</th>
-      <th class="large">Privilegeset</th>
-      <th class="medium">Roletype</th>
-      <th class="medium">Role</th>
-      <th class="small">Accept</th>
-      <th class="small">Reject</th>
-      <th class="small">Leave</th>
-    </tr>
-    <% @permissions.each_with_index do |permission, index|  %>
-        <tr>
-          <td><span><%=permission.operation_string.capitalize%></span><input type="hidden" name="permissions[<%=index.to_s%>][id]" value="<%=permission.id.to_s%>"/></td>
-          <td><span title='<%=permission.privilege_set.comment%>'><%=permission.privilege_set_name%></span></td>
-          <td><span><%=permission.pristine_role.role_type%></span></td>
-          <td><span><%=permission.pristine_role.name%></span></td>
-          <td><input type="radio" name="permissions[<%=index.to_s%>][action]" value="accept"/></td>
-          <td><input type="radio" name="permissions[<%=index.to_s%>][action]" value="reject"/></td>
-          <td><input type="radio" name="permissions[<%=index.to_s%>][action]" value="leave" checked="checked"/></td>
-        </tr>
-     <% end %>
-  </table>
-    <input type="button" value="Cancel" onclick="window.location.reload();"/>
-    <input type="submit" value="OK"/>
-  <% end %>
+<div class="cbac">
+  <h1>Permissions: available upgrades</h1>
+  <span>Choose which of these available permissions you want to accept or reject.
+    Each upgrade either adds a new permission or revokes an existing permission.
+    You can also leave the available upgrade for another time.</span><br/><br/>
+  <% form_tag cbac_upgrade_update_path  do %>
+  <table>
+    <tr>
+      <th class="medium">Add /revoke</th>
+      <th class="large">Privilegeset</th>
+      <th class="medium">Roletype</th>
+      <th class="medium">Role</th>
+      <th class="small">Accept</th>
+      <th class="small">Reject</th>
+      <th class="small">Leave</th>
+    </tr>
+    <% @permissions.each_with_index do |permission, index|  %>
+        <tr>
+          <td><span><%=permission.operation_string.capitalize%></span><input type="hidden" name="permissions[<%=index.to_s%>][id]" value="<%=permission.id.to_s%>"/></td>
+          <td><span title='<%=permission.privilege_set.comment%>'><%=permission.privilege_set_name%></span></td>
+          <td><span><%=permission.pristine_role.role_type%></span></td>
+          <td><span><%=permission.pristine_role.name%></span></td>
+          <td><input type="radio" name="permissions[<%=index.to_s%>][action]" value="accept"/></td>
+          <td><input type="radio" name="permissions[<%=index.to_s%>][action]" value="reject"/></td>
+          <td><input type="radio" name="permissions[<%=index.to_s%>][action]" value="leave" checked="checked"/></td>
+        </tr>
+     <% end %>
+  </table>
+    <input type="button" value="Cancel" onclick="window.location.reload();"/>
+    <input type="submit" value="OK"/>
+  <% end %>
 </div>

data/migrations/20110211105533_add_pristine_files_to_cbac_upgrade_path.rb CHANGED

@@ -1,16 +1,16 @@
-class AddPristineFilesToCbacUpgradePath < ActiveRecord::Migration
-  def self.up
-    create_table :cbac_pristine_files do |t|
-      t.string :type
-      t.string :file_name
-      t.timestamps
-    end
-    add_column :cbac_staged_permissions, :pristine_file_id, :integer
-  end
-  def self.down
-    drop_table :cbac_pristine_files
-    remove_column :cbac_staged_permissions, :pristine_file_id
-  end
-end
+class AddPristineFilesToCbacUpgradePath < ActiveRecord::Migration
+  def self.up
+    create_table :cbac_pristine_files do |t|
+      t.string :type
+      t.string :file_name
+      t.timestamps
+    end
+    add_column :cbac_staged_permissions, :pristine_file_id, :integer
+  end
+  def self.down
+    drop_table :cbac_pristine_files
+    remove_column :cbac_staged_permissions, :pristine_file_id
+  end
+end