developers/Orbit
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen

Browse Source
This commit is contained in:
Matthew K. Fu JuYuan authored and Christophe Vilayphiou committed 2012-04-30 00:24:11 +08:00
1 parent 382932036d
commit a46a8898d7
15 files changed
+86 -39
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/views/admin/components/_user_role_management.html.erb
+7 -7
View File
@@ -1,21 +1,21 @@
<div id="open_for_all_user">
<h1>All User</h1>
<h1><%= t("admin.user_role.auth.all_member") %></h1>
<%= form_tag(submit_url) do %>
<%= check_box_tag 'auth_all',true,(auth.all rescue true) %><%= submit_tag 'Add Role' %><br/>
<%= check_box_tag 'auth_all',true,(auth.all rescue true) %><%= submit_tag t("admin.user_role.auth.all_member") %><br/>
<% end %>
</div>
<div id="user_role_management">
<h1>User Role</h1>
<h1><%= t("admin.user_role.auth.user") %></h1>
<%= form_tag(submit_url) do %>
<%= collection_select(:new,:role, Role.all, :id, :key, :prompt => true) %>
<%= submit_tag 'Add Role' %><br/>
<%= submit_tag t("admin.user_role.auth.by_role") %><br/>
<%= collection_select(:new,:sub_role, SubRole.all, :id, :key, :prompt => true) %>
<%= submit_tag 'Add SubRole' %><br/>
<%= submit_tag t("admin.user_role.auth.by_sub_role") %><br/>
<%= collection_select(:new,:privilege_user, User.all, :id, :name, :prompt => true) %>
<%= submit_tag 'Add PrivilegeList' %><br/>
<%= submit_tag t("admin.user_role.auth.add_to_privilege_list") %><br/>
<%= collection_select(:new,:blocked_user, User.all, :id, :name, :prompt => true) %>
<%= submit_tag 'Add BlockedList' %><br/>
<%= submit_tag t("admin.user_role.auth.add_to_block_list") %><br/>
<% end %>
<% unless auth.nil? %>
<% auth.roles.each do |role| %>
app/views/admin/module_apps/edit.html.erb
+8 -15
View File
@@ -1,37 +1,30 @@
<% content_for :secondary do %>
<% end %>
<!-- Remove if CSS done-->
<br />
<br />
<br />
<!-- Remove if CSS done-->
<h3><%= @module_app.title %></h3>
<h3><%= @module_app.title%></h3>
<div id="manager_management">
<h1>Manager</h1>
<dl id="manager">
<dt>Manager</ht>
<dt><%= t("admin.user_role.auth.manager") %></ht>
<% @module_app.managers.each do |manager| %>
<dd><%= manager.user.name %> <%= get_auth_by(manager) %> <%= link_to '[X]',remove_manager_admin_module_app_path(@module_app,manager),:method => :delete if if_permit_to_delete(:manager) && manager.user != current_user %> </dd>
<% end %>
<dd>Add:
<dd>
<%= form_tag(assign_manager_admin_module_app_path) do %>
<%= collection_select(:manager,:id, User.all, :id, :name, :prompt => true,:disabled => !if_permit_to_assign(:manager))%>
<%= submit_tag 'Add Manager' %>
<%= submit_tag t("admin.user_role.auth.add_manager") %>
<% end %>
</dd>
</dl>
<dl id="sub_manager">
<dt>Sub Manager</ht>
<dt><%= t("admin.user_role.auth.sub_manager") %></ht>
<% @module_app.sub_managers.each do |manager| %>
<dd><%= manager.user.name %> -AuthBy:<%= manager.rule_creator.name %> <%= link_to '[X]',remove_sub_manager_admin_module_app_path(@module_app,manager),:method => :delete if if_permit_to_delete(:sub_manager) && manager.user != current_user %> </dd>
<dd><%= manager.user.name %> <%= get_auth_by(manager) %><%= link_to '[X]',remove_sub_manager_admin_module_app_path(@module_app,manager),:method => :delete if if_permit_to_delete(:sub_manager) && manager.user != current_user %> </dd>
<% end %>
<dd>Add:
<dd>
<%= form_tag(assign_sub_manager_admin_module_app_path) do %>
<%= collection_select(:sub_manager,:id, User.all, :id, :name, :prompt => true,:disabled => !if_permit_to_assign(:sub_manager))%>
<%= submit_tag 'Add Sub Manager' %>
<%= submit_tag t("admin.user_role.auth.add_sub_manager") %>
<% end %>
</dd>
</dl>
app/views/admin/object_auths/edit.html.erb
-5
View File
@@ -1,11 +1,6 @@
<% content_for :secondary do %>
<% end %>
<!-- Remove if CSS done-->
<br />
<br />
<br />
<!-- Remove if CSS done-->
<h3><%= @object_auth.title %></h3>
<%= render :partial => "admin/components/user_role_management", :locals => {