diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 12797db..98c53df 100755 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -2,4 +2,8 @@ class UsersController < ApplicationController def index @users = User.all end + def add_role + @user.find(params[:id]) + @user.add_role(params[:role]) + end end diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 8672015..f630561 100755 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -4,13 +4,13 @@ - <% @users.each do |user|%> +<% @users.each do |user|%> - +<% end %><% end %>
NameE-MailRollen
+ <%= user.email %>
    <% user.roles.each do |role| %>
  • <%= role.name%>
  • -<% end %>
<%= link_to 'MK FETUSER', user_add_role_path(user, "fetadmin")%>
diff --git a/config/routes.rb b/config/routes.rb index 69f3eb1..1a9ebfb 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,7 +4,8 @@ resources :home, :only=>[:index] #get 'home',:controller=>home,:action=>:index,:as=>"home_index" scope '(:locale)/admin' do - resources :users + resources :users, :only => [:index] + get 'users/:id/add_role/:role', :controller=>:users, :action=>:add_role, :as=>'user_add_role' get 'config',:controller=>:config,:action=>:index , :as => 'config' get 'config/get_git_update',:controller=>:config,:action=>:get_git_update, :as=>'config_getgitupdate' get 'config/get_git_update',:controller=>:config,:action=>:get_git_update