developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ray's back-end modifications for sub-roles

Browse Source
This commit is contained in:
Christophe Vilayphiou committed 2011-12-28 20:57:18 +08:00
1 parent 62aaf79491
commit 75c9851dbc
10 files changed
+83 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/views/admin/users/_form.html.erb
+1 -1
View File
@@ -28,7 +28,7 @@
<% @roles.each do |role| %>
<div id="<%= role.id %>_block" class="attributes_block <%= @class %>" <%= raw(' style="display: none;"') unless ((@user.role.id.eql?(role.id) rescue nil) || (role.key.eql?('student') && @user.new_record?)) %>>
<h2><%= role.i18n_variable[I18n.locale] %></h2>
<hr>
<hr class="<#%= @user.role.key %>_block">
<%= render :partial => 'sub_role_selector', :locals => {:f => f, :role => role} %>
<%= render :partial => 'sub_role', :collection => role.sub_roles, :locals => {:f => f, :role => role} %>
</div>
app/views/admin/users/_show_sub_role.html.erb
+1 -1
View File
@@ -1,4 +1,4 @@
<div id="sub_role_<%= show_sub_role.id %>" class="info_input">
<div id="sub_role_<%= show_sub_role.id %>" class="group">
<h2><%= show_sub_role.i18n_variable[I18n.locale] %></h2>
<%= render :partial => 'show_attribute', :object => show_sub_role %>
</div>
app/views/admin/users/_sub_role.html.erb
+5 -3
View File
@@ -1,5 +1,6 @@
<div id="sub_role_<%= sub_role.id %>" class="info_input" <%= raw(' style="display: none;"') unless @user.sub_role_ids.include?(sub_role.id) %>>
<h2><%= sub_role.i18n_variable[I18n.locale] %></h2>
<div id="sub_role_<%= sub_role.id %>" class="group" <%= raw(' style="display: none;"') unless @user.sub_role_ids.include?(sub_role.id) %>>
<h2><%= sub_role.i18n_variable[I18n.locale] %></h2>
<div class="info_input">
<table border="0" cellspacing="0" cellpadding="0">
<thead class="list_head">
<tr>
@@ -34,4 +35,5 @@
<% end %>
</tbody>
</table>
</div>
</div>
</div>
app/views/admin/users/show.html.erb
+2 -2
View File
@@ -20,9 +20,9 @@
</div>
<% end -%>
<div id="<%= @user.role.key %>_block" class="roles_block <%= @class %>">
<div id="basic_block" class="roles_block <%= @class %>">
<h2><%= @user.role.i18n_variable[I18n.locale] %></h2>
<hr>
<hr class="<%= @user.role.key %>_block">
<%= render :partial => 'show_sub_role', :collection => @user.sub_roles %>
</div>
<div class="button_bar">