Download as
Browse Code »

Commit f142891e9d09d1001a2de0356f30466654273d3a

Authored by MoisesMachado
1 parent f285ecc3
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem5: interface to manage roles functional 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@483 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 6 changed files with 19 additions and 7 deletions   Show diff stats
app/controllers/role_controller.rb
  Diff comments   View file @f142891
@@ -8,7 +8,7 @@ class RoleController < ApplicationController @@ -8,7 +8,7 @@ class RoleController < ApplicationController
8 end 8 end
9 9
10 def new 10 def new
11 - @role = Role.new(:name => 'bla', :permissions => []) 11 + @role = Role.new(:name => '', :permissions => [])
12 end 12 end
13 13
14 def create 14 def create
app/models/role.rb
  Diff comments   View file @f142891
@@ -11,9 +11,8 @@ class Role < ActiveRecord::Base @@ -11,9 +11,8 @@ class Role < ActiveRecord::Base
11 } 11 }
12 12
13 def self.permission_name(p) 13 def self.permission_name(p)
14 -# msgid = ...  
15 -# gettext(msgid)  
16 - raise "Moises need to write me" 14 + msgid = PERMISSIONS.values.inject({}){|s,v| s.merge(v)}[p]
  15 + gettext(msgid)
17 end 16 end
18 17
19 has_many :role_assignments 18 has_many :role_assignments
app/views/role/_form.rhtml
  Diff comments   View file @f142891
1 <%= error_messages_for :role %> 1 <%= error_messages_for :role %>
2 2
3 -<% labelled_form_for :role, @role do |f| %> 3 +<% labelled_form_for :role, @role, :url => (mode == :edit) ? {:action => 'update', :id => role} : {:action => 'create'} do |f| %>
4 4
5 <%= f.text_field :name %> 5 <%= f.text_field :name %>
6 6
7 <%= _('Permissions: ') %> <br> 7 <%= _('Permissions: ') %> <br>
8 <% Role::PERMISSIONS[:profile].keys.each do |p| %> 8 <% Role::PERMISSIONS[:profile].keys.each do |p| %>
9 - <%= labelled_form_field("bla", (check_box_tag "role[permissions][#{p}]", @role.has_permission?(p))) %> 9 + <%= labelled_form_field(Role.permission_name(p), (check_box_tag "role[permissions][]", p, @role.has_permission?(p))) %>
10 <% end %> 10 <% end %>
  11 +
  12 + <%= submit_tag (mode == :edit) ? _('Save changes') : _('Create role')%>
11 <% end %> 13 <% end %>
app/views/role/edit.rhtml 0 → 100644
  Diff comments   View file @f142891
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
  1 +<h2> <%= _("Editing #{@role.name}") %> </h2>
  2 +
  3 +<%= render :partial => 'form', :locals => { :mode => :edit, :role => @role } %>
app/views/role/index.rhtml
  Diff comments   View file @f142891
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <li> 4 <li>
5 <%= link_to role.name, :action => 'show', :id => role %> 5 <%= link_to role.name, :action => 'show', :id => role %>
6 <%= link_to _('Edit'), :action => 'edit', :id => role %> 6 <%= link_to _('Edit'), :action => 'edit', :id => role %>
7 - <%= link_to _('Destroy'), :action => 'destoy', :id => role %> 7 + <%= link_to _('Destroy'), :action => 'destroy', :id => role %>
8 </li> 8 </li>
9 <% end %> 9 <% end %>
10 </ul> 10 </ul>
app/views/role/show.rhtml 0 → 100644
  Diff comments   View file @f142891
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
  1 +<h1> <%= _(@role.name) %></h1>
  2 +
  3 +
  4 +<ul>
  5 + <% @role.permissions.each do |p| %>
  6 + <li> <%= Role.permission_name(p) %> </li>
  7 + <% end %>
  8 +</ul>