From: Jozef Zigmund <jzigm...@redhat.com>
---
src/app/views/permissions/list.haml | 31 +++++++++++++++++++++++++
src/app/views/permissions/list.html.erb | 38 -------------------------------
src/app/views/permissions/new.haml | 18 ++++++++++++++
src/app/views/permissions/new.html.erb | 17 -------------
4 files changed, 49 insertions(+), 55 deletions(-)
create mode 100644 src/app/views/permissions/list.haml
delete mode 100644 src/app/views/permissions/list.html.erb
create mode 100644 src/app/views/permissions/new.haml
delete mode 100644 src/app/views/permissions/new.html.erb
diff --git a/src/app/views/permissions/list.haml
b/src/app/views/permissions/list.haml
new file mode 100644
index 0000000..27831d0
--- /dev/null
+++ b/src/app/views/permissions/list.haml
@@ -0,0 +1,31 @@
+- if @permission_object.permissions.size == 0
+ %h1
+ There are no permissions defined on #...@permission_object.name}
+- else
+ %table
+ %thead
+ %tr
+ %th{:scope => "col"} User
+ %th{:scope => "col"} Role
+ %th{:scope => "col"} Action
+ %tbody
+ - @permission_object.permissions.each {|permission|
+ %tr
+ %td= permission.user.login
+ %td= permission.role.name
+ %td
+ - if has_set_perms?
+ - form_tag :action => 'destroy' do
+ = hidden_field :permission, :id, :value => permission.id
+ = submit_tag "delete", :class => "submit_link", :id =>
"delete_#{permission.id}"
+ - }
+= link_to "Add a user",
|
+ {:controller => "users",
|
+ :action => "new"},
|
+ :class=>"actionlink" if
has_user_modify?(BasePermissionObject.general_permission_scope) |
+-#
+= link_to "Add a new permission record", |
+ {:action => "new", |
+ :permission_object_type => @permission_object.class, |
+ :permission_object_id => @permission_object.id}, |
+ :class=>"actionlink" if has_set_perms? |
diff --git a/src/app/views/permissions/list.html.erb
b/src/app/views/permissions/list.html.erb
deleted file mode 100644
index 862a32f..0000000
--- a/src/app/views/permissions/list.html.erb
+++ /dev/null
@@ -1,38 +0,0 @@
-<% if @permission_object.permissions.size == 0 %>
-<h1>There are no permissions defined on <%= @permission_object.name%></h1>
-<% else %>
- <table>
- <thead>
- <tr>
- <th scope="col">User</th>
- <th scope="col">Role</th>
- <th scope="col">Action</th>
- </tr>
- </thead>
- <tbody>
- <%...@permission_object.permissions.each {|permission| %>
- <tr>
- <td><%= permission.user.login %></td>
- <td><%= permission.role.name %></td>
- <td>
- <% if has_set_perms? %>
- <% form_tag :action => 'destroy' do %>
- <%= hidden_field :permission, :id, :value => permission.id %>
- <%= submit_tag "delete", :class => "submit_link", :id =>
"delete_#{permission.id}" %>
- <% end %>
- <% end %>
- </td>
- </tr>
- <% } %>
- </tbody>
- </table>
-<% end %>
-<%= link_to "Add a user",
- {:controller => "users",
- :action => "new"},
- :class=>"actionlink" if
has_user_modify?(BasePermissionObject.general_permission_scope) %>
-<%= link_to "Add a new permission record",
- {:action => "new",
- :permission_object_type => @permission_object.class,
- :permission_object_id => @permission_object.id},
- :class=>"actionlink" if has_set_perms? %>
diff --git a/src/app/views/permissions/new.haml
b/src/app/views/permissions/new.haml
new file mode 100644
index 0000000..15a06f9
--- /dev/null
+++ b/src/app/views/permissions/new.haml
@@ -0,0 +1,18 @@
+.dcloud_form
+ = error_messages_for 'permission'
+ %h2
+ Add new Permission for #...@permission_object.name}
+ %br/
+ - form_tag :action => 'create' do
+ %ul
+ %li
+ %label
+ User
+ %span User to receive permission grant
+ = select("permission", "user_id", @users.collect {|u| [ u.login, u.id
] }, { :include_blank => true })
+ %li
+ %label Role
+ = select("permission", "role_id", @roles.collect {|r| [ r.name, r.id ]
}, { :include_blank => true })
+ = hidden_field :permission, :permission_object_type
+ = hidden_field :permission, :permission_object_id
+ = submit_tag "Save", :class => "submit"
diff --git a/src/app/views/permissions/new.html.erb
b/src/app/views/permissions/new.html.erb
deleted file mode 100644
index dd102ce..0000000
--- a/src/app/views/permissions/new.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="dcloud_form">
- <%= error_messages_for 'permission' %>
-
- <h2>Add new Permission for <%= @permission_object.name %></h2><br />
- <% form_tag :action => 'create' do-%>
- <ul>
- <li><label>User<span>User to receive permission grant</span></label>
- <%= select("permission", "user_id", @users.collect {|u| [ u.login,
u.id ] }, { :include_blank => true }) %>
- </li>
- <li><label>Role</label>
- <%= select("permission", "role_id", @roles.collect {|r| [ r.name, r.id
] }, { :include_blank => true }) %>
- </li>
- <%= hidden_field :permission, :permission_object_type %>
- <%= hidden_field :permission, :permission_object_id %>
- <%= submit_tag "Save", :class => "submit" %>
- <% end %>
-</div>
--
1.7.2.2
_______________________________________________
deltacloud-devel mailing list
deltacloud-devel@lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
