From 05b73d10bfd62a448e8645b51042e6438f2972eb Mon Sep 17 00:00:00 2001
From: MoisesMachado <MoisesMachado@3f533792-8f58-4932-b0fe-aaf55b0a4547>
Date: Thu, 18 Oct 2007 23:35:32 +0000
Subject: [PATCH] ActionItem111: alguns bugs corrigidos e populate melhorado

---
 app/controllers/public/home_controller.rb |  4 +++-
 app/helpers/application_helper.rb         | 19 +++++++++----------
 app/models/person.rb                      |  8 ++++++++
 app/views/role/edit.rhtml                 |  2 +-
 script/populate                           | 15 ++++++++++++++-
 5 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/app/controllers/public/home_controller.rb b/app/controllers/public/home_controller.rb
index 5f3a84b..791c908 100644
--- a/app/controllers/public/home_controller.rb
+++ b/app/controllers/public/home_controller.rb
@@ -1,5 +1,7 @@
 class HomeController < PublicController
 
   design :holder => 'environment'
-
+  def index
+#    redirect_to homepage_path(:profile => 'anhetegua')
+  end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f7ef37c..8569ed9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -118,7 +118,7 @@ module ApplicationHelper
        ( link_to_homepage(current_user.login) ),
        ( link_to(_('My account'), { :controller => 'account' }) ),
        ( link_to_myprofile _('My Enterprises'), {:controller => 'membership_editor'} ),
-       ( link_to(_('Admin'), { :controller => 'admin_panel' }) if current_user.person.role_assignments.map{|ra| ra.role.permissions}.any?{|ps|ps.any?{|p|ActiveRecord::Base::PERMISSIONS[:environment].keys.include?(p)}}),
+       ( link_to(_('Admin'), { :controller => 'admin_panel' }) if current_user.person.is_admin?),
     ].join("\n")
     content_tag('span', links, :id => 'user_links')
   end
@@ -174,20 +174,19 @@ module ApplicationHelper
   
   def person_links
     links = [
-      [(link_to_myprofile _('Edit visual design'), :controller => 'profile_editor', :action => 'design_editor'), 'edit_profile_design', profile],
-      [(link_to_myprofile _('Edit profile'), :controller => 'profile_editor'), 'edit_profile', profile],
-      [(link_to_myprofile _('Manage content'), :controller => 'cms'), 'post_content', profile],
+      [(link_to_myprofile _('Edit visual design'), {:controller => 'profile_editor', :action => 'design_editor'}, profile.identifier), 'edit_profile_design', profile],
+      [(link_to_myprofile _('Edit profile'), {:controller => 'profile_editor'}, profile.identifier), 'edit_profile', profile],
+      [(link_to_myprofile _('Manage content'), {:controller => 'cms'}, profile.identifier), 'post_content', profile],
     ]
-
   end
 
   
   def enterprise_links
     links = [
-      [(link_to_myprofile _('Edit visual design'), :controller => 'profile_editor', :action => 'design_editor'), 'edit_profile_design', profile],
-      [(link_to_myprofile _('Edit informations'), :controller => 'profile_editor'), 'edit_profile', profile],
-      [(link_to_myprofile _('Manage content'), :controller => 'cms'), 'post_content', profile],
-      [(link_to_myprofile _('Exclude'), :controller => 'enterprise_editor', :action => 'destroy'), 'edit_profile', profile],
+      [(link_to_myprofile _('Edit visual design'), {:controller => 'profile_editor', :action => 'design_editor'}, profile), 'edit_profile_design', profile],
+      [(link_to_myprofile _('Edit informations'), {:controller => 'profile_editor'}, profile), 'edit_profile', profile],
+      [(link_to_myprofile _('Manage content'), {:controller => 'cms'}, profile), 'post_content', profile],
+      [(link_to_myprofile _('Exclude'), {:controller => 'enterprise_editor', :action => 'destroy'}, profile), 'edit_profile', profile],
     ]
   end
 
@@ -237,7 +236,7 @@ module ApplicationHelper
   # Current implementation generates a <label> tag for +label+ and wrap the
   # label and the control with a <div> tag with class 'formfield' 
   def display_form_field(label, html_for_field)
-    content_tag('div', content_tag('div', content_tag('label', label)) + html_for_field, :class => 'formfield') 
+    content_tag('div', content_tag('div', content_tag('label', label)) +html_for_field, :class => 'formfield') 
   end
 
   alias_method :labelled_form_field, :display_form_field
diff --git a/app/models/person.rb b/app/models/person.rb
index 107d649..f412b97 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -52,4 +52,12 @@ class Person < Profile
   def email
     self.user.nil? ? nil : self.user.email
   end
+
+  def is_admin?
+    role_assignments.map{|ra|ra.role.permissions}.any? do |ps|
+      ps.any? do |p|
+        ActiveRecord::Base::PERMISSIONS[:environment].keys.include?(p)
+      end
+    end
+  end
 end
diff --git a/app/views/role/edit.rhtml b/app/views/role/edit.rhtml
index 3714a42..a8ff970 100644
--- a/app/views/role/edit.rhtml
+++ b/app/views/role/edit.rhtml
@@ -1,3 +1,3 @@
 <h2> <%= _("Editing #{@role.name}") %> </h2>
 
-<%= render :partial => 'form', :locals => { :mode => :edit, :role => @role } %>
+<%= render :partial => 'form', :locals => { :mode => :edit, :role => @role, :permissions => ActiveRecord::Base::PERMISSIONS[@role.kind] } %>
diff --git a/script/populate b/script/populate
index 5478221..f0f1fb7 100755
--- a/script/populate
+++ b/script/populate
@@ -1,9 +1,22 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../config/environment'
 
+anhetegua = Profile.create!(:name => 'anhetegua', :identifier => 'anhetegua')
+
 User.create!(:login => 'testprofile', :email => 'admin@localhost.localdomain', :password => 'test', :password_confirmation => 'test')
 User.create!(:login => 'user', :email => 'user@localhost.localdomain', :password => 'user', :password_confirmation => 'user')
 User.create!(:login => 'usuario', :email => 'usuario@localhost.localdomain', :password => 'usuario', :password_confirmation => 'usuario')
-User.create!(:login => 'ze', :email => 'ze@localhost.localdomain', :password => 'test', :password_confirmation => 'test')
+ze = User.create!(:login => 'ze', :email => 'ze@localhost.localdomain', :password => 'test', :password_confirmation => 'test')
+root = User.create!(:login => 'root', :email => 'root@noosfero.org', :password => 'root', :password_confirmation => 'root').person
+
+admin_role = Role.create!(:name => 'admin', :permissions => ['edit_environment_features', 'edit_environment_design', 'manage_environment_categories', 'manage_environment_roles', 'manage_environment_validators'])
+
+RoleAssignment.create!(:accessor => root, :role => admin_role, :resource => nil)
+
+empa = Enterprise.create!(:name => 'Empreendimento A', :identifier => 'empreendimento_a')
+
+owner_role = Role.create!(:name => 'owner', :permissions => ['edit_profile', 'destroy_profile', 'manage_memberships', 'post_content', 'edit_profile_design'])
 
+RoleAssignment.create!(:accessor => ze, :role => owner_role, :resource => empa)
+RoleAssignment.create!(:accessor => root, :role => owner_role, :resource => anhetegua)
 
--
libgit2 0.21.2