ActionItem5: linked the functionlity of managing members of profiles and editing the enterprise info

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@566 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem5: linked the functionlity of managing members of profiles and editing the enterprise info
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@566 3f533792-8f58-4932-b0fe-aaf55b0a4547
MoisesMachado
1 parent 5d1a3c2d
Showing 9 changed files with 25 additions and 12 deletions Show diff stats
app/controllers/application.rb
app/controllers/profile_admin/enterprise_editor_controller.rb
app/models/enterprise.rb
app/models/profile.rb
app/models/role.rb
app/views/enterprise_editor/index.rhtml
app/views/membership_editor/index.rhtml
app/views/profile_members/index.rhtml
test/fixtures/roles.yml
@@ -57,9 +57,9 @@ class ApplicationController &lt; ActionController::Base
   # * +permission+ must be a symbol or string naming the needed permission.
   # * +target+ is the object over witch the user would need the specified permission.
   def self.protect(actions, permission, target = nil)
-    before_filter :only => actions do |controller|
-      unless controller.send(:logged_in?) and controller.send(:current_user).person.has_permission?(permission, target)
-          controller.send(:render, {:file => 'app/views/shared/access_denied.rhtml', :layout => true})
+    before_filter :only => actions do |c|
+      unless c.send(:logged_in?) && c.send(:current_user).person.has_permission?(permission.to_s, c.send(target))
+        c.send(:render, {:file => 'app/views/shared/access_denied.rhtml', :layout => true})
       end
     end
   end
 class EnterpriseEditorController < ProfileAdminController
   before_filter :logon, :check_enterprise
-  
+  protect [:edit, :update], :edit_profile, :profile
+  protect [:destroy], :destroy_profile, @profile
+
+
   # Show details about an enterprise  
   def index
     @enterprise = @profile
@@ -8,11 +8,11 @@ class Enterprise &lt; Organization
   end  
   # Test that an enterprise can't be activated unless was previously approved
-  def validate
-    if self.active && !self.approved?
-      errors.add('active', _('Not approved enterprise can\'t be activated'))
-    end
-  end
+#  def validate
+#    if self.active && !self.approved?
+#      errors.add('active', _('Not approved enterprise can\'t be activated'))
+#    end
+#  end
   # Activate the enterprise so it can be seen by other users
   def activate
@@ -50,6 +50,7 @@ class Profile &lt; ActiveRecord::Base
   validates_presence_of :identifier, :name
   validates_format_of :identifier, :with => IDENTIFIER_FORMAT
   validates_exclusion_of :identifier, :in => RESERVED_IDENTIFIERS
+  validates_uniqueness_of :identifier
   # A profile_owner cannot have more than one profile, but many profiles can exist
   # without being associated to a particular user.
@@ -6,7 +6,6 @@ class Role &lt; ActiveRecord::Base
       'destroy_profile' => N_('Destroy profile'),
       'manage_memberships' => N_('Manage memberships'),
       'post_content' => N_('Post content'),
-      'moderate_content' => N_('Moderate content'),
     },
     :system => {
     }
 <h3> <%= @profile.name %> </h3>
+<%= error_messages_for 'profile' %>
+
 <p> <%= _('Identifier: ') %> <%= @profile.identifier %> </p>
 <p> <%= _('Address: ') %> <%= @profile.address %> </p>
 <p> <%= _('Contact phone: ') %> <%= @profile.contact_phone %> </p>
@@ -17,3 +19,5 @@
 <%= help _('Remove the enterprise from the system') %>
 <%= link_to _('Activate'), :action => 'activate', :id => @profile unless @profile.active? %>
 <%= help _('Activate an approved enterprise') unless @profile.active? %>
+
+<%= link_to _('Back'), :controller => :profile_editor %>
@@ -2,7 +2,10 @@
 <ul>
 <% @memberships.each do |m|%>
-  <li> <%= link_to m.name, '/' + m.identifier %> </li>
+  <li> 
+    <%= link_to m.name, '/' + m.identifier %> 
+    <%= link_to _('Manage') , '/myprofile/' + m.identifier %>
+  </li>
 <% end %>
 </ul>
@@ -9,3 +9,5 @@
          <%= link_to _('Remove member'), :action => 'unassociate', :id => m %></li>
   <% end %>
 </ul>
+
+<%= link_to _('Back'), :controller => 'profile_editor' %>
@@ -8,6 +8,8 @@ two:
   id: 2
   name: 'owner'
   permissions:
+   - menage_memberships
+   - post_content
    - destroy_profile
    - edit_profile
 three:
@@ -15,4 +17,3 @@ three:
   name: 'moderator'
   permissions:
     - manage_memberships
-    - moderate_content
	@@ -50,6 +50,7 @@ class Profile < ActiveRecord::Base		@@ -50,6 +50,7 @@ class Profile < ActiveRecord::Base
50	validates_presence_of :identifier, :name	50	validates_presence_of :identifier, :name
51	validates_format_of :identifier, :with => IDENTIFIER_FORMAT	51	validates_format_of :identifier, :with => IDENTIFIER_FORMAT
52	validates_exclusion_of :identifier, :in => RESERVED_IDENTIFIERS	52	validates_exclusion_of :identifier, :in => RESERVED_IDENTIFIERS
		53	+ validates_uniqueness_of :identifier
53		54
54	# A profile_owner cannot have more than one profile, but many profiles can exist	55	# A profile_owner cannot have more than one profile, but many profiles can exist
55	# without being associated to a particular user.	56	# without being associated to a particular user.
	@@ -9,3 +9,5 @@		@@ -9,3 +9,5 @@
9	<%= link_to _('Remove member'), :action => 'unassociate', :id => m %></li>	9	<%= link_to _('Remove member'), :action => 'unassociate', :id => m %></li>
10	<% end %>	10	<% end %>
11	</ul>	11	</ul>
		12	+
		13	+<%= link_to _('Back'), :controller => 'profile_editor' %>
	@@ -8,6 +8,8 @@ two:		@@ -8,6 +8,8 @@ two:
8	id: 2	8	id: 2
9	name: 'owner'	9	name: 'owner'
10	permissions:	10	permissions:
		11	+ - menage_memberships
		12	+ - post_content
11	- destroy_profile	13	- destroy_profile
12	- edit_profile	14	- edit_profile
13	three:	15	three:
	@@ -15,4 +17,3 @@ three:		@@ -15,4 +17,3 @@ three:
15	name: 'moderator'	17	name: 'moderator'
16	permissions:	18	permissions:
17	- manage_memberships	19	- manage_memberships
18	- - moderate_content