From 943c510086df296eb9b8f6092acc86543c24221d Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Sun, 27 Oct 2013 17:12:24 +0100 Subject: [PATCH 1/2] usercontroller --- app/controllers/users_controller.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 2bea1a1..2741498 100755 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,21 +1,21 @@ class UsersController < ApplicationController - def index + def index @users = User.all - end - def add_role + end + def add_role @user= User.find(params[:id]) if (params[:role]=="fetuser" && can?(:addfetuser,User)) - @user.add_role(params[:role]) + @user.add_role(params[:role]) end if (params[:role]=="fetadmin" && can?(:addfetadmin,User)) - @user.add_role(params[:role]) + @user.add_role(params[:role]) end redirect_to users_url - end - def do_confirm + end + def do_confirm @user= User.find(params[:id]) @user.confirm! - + redirect_to users_url - end + end end From 1d16b2f87afda69151be004ae90f7fe9c6a05ddb Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Sun, 27 Oct 2013 17:12:50 +0100 Subject: [PATCH 2/2] gem seed_dump --- Gemfile | 1 + Gemfile.lock | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Gemfile b/Gemfile index 6cc16f9..69bc42c 100755 --- a/Gemfile +++ b/Gemfile @@ -84,3 +84,4 @@ gem 'rmagick' gem 'bootstrap-addons-rails' gem "jquery-fileupload-rails" +gem "seed_dump", "~> 0.5.3" \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index c4d9168..b25609c 100755 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -179,6 +179,7 @@ GEM railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) + seed_dump (0.5.3) simple_calendar (0.1.9) rails (>= 3.0) sprockets (2.2.2) @@ -237,6 +238,7 @@ DEPENDENCIES rolify rspec-rails sass-rails (~> 3.2) + seed_dump (~> 0.5.3) simple_calendar (~> 0.1.9) sqlite3 therubyracer