removing users from projects

app/controllers/project_users_controller.rb

@@ -17,5 +17,10 @@ def create
     end
   end
   def destroy
+    @project_user = ProjectUser.where(:project_id => current_user.projects).find(params[:project_id])
+    @project = @project_user.project
+    @project_user.destroy
+    flash[:notice] = t('project_users.actions.remove_user.successful')
+    redirect_to @project
   end
 end

app/models/user.rb

@@ -1,5 +1,6 @@
 class User < ActiveRecord::Base
   has_many :project_users
+  has_many :owned_project_users, :through => :projects
   has_many :projects, :through => :project_users
 
   # Include default devise modules. Others available are:

app/views/home/index.html.haml

@@ -1,8 +1,8 @@
 - if user_signed_in?
-  = link_to t(:sign_out), destroy_user_session_path
+  = link_to t('sign_out'), destroy_user_session_path
   = link_to t('projects.owned'), projects_path(current_user)
 - else
-  = link_to t(:sign_in), new_user_session_path
-  = link_to t(:sign_up), new_user_registration_path
+  = link_to t('sign_in'), new_user_session_path
+  = link_to t('sign_up'), new_user_registration_path
 
-%h3 Home#index
+%h3= t('home')

app/views/projects/show.html.haml

@@ -1,9 +1,11 @@
 %h2= t('activerecord.project') + " #{@project.name}"
-%p= "Api Token:  #{@project.api_token}"
+%p= t('activerecord.attributes.project.api_token')+" #{@project.api_token}"
 %p= t('projects.watchers')
 %ul
-  - @project.users.each do |watcher|
-    %li= watcher.email
+  - @project.project_users.each do |project_user|
+    %li
+      = project_user.user.email
+      = link_to t('projects.remove_user'), project_user, :confirm => t('confirmations.delete'), :method => :delete
 %p= link_to t('projects.add_user'), new_project_user_path(:project_id => @project.id)
 %p
   %b= t('issues.all')

config/locales/en.yml

@@ -9,6 +9,7 @@ en:
     attributes:
       project:
         name: Project name
+        api_token: Api token
       user:
         name: User name
         email: Email
@@ -29,6 +30,7 @@ en:
     delete: Delete
     save: Save project
     add_user: Add user
+    remove_user: Remove user
     watchers: Watchers
     actions:
       destroy:
@@ -50,6 +52,9 @@ en:
       add_user:
         successful: User successfully added as a watcher
         failed: Cannot add user as a watcher
+      remove_user:
+        successful: User successfully removed from the project
+        failed: Cannot remove user form the project
   sign_in: Sign in
   sign_out: Sign out
   sign_up: Sign up