aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/users_controller.rb
diff options
context:
space:
mode:
authorMarc Florisson2012-08-30 16:24:36 +0200
committerMarc Florisson2012-08-30 16:24:36 +0200
commit2dca376725013ac504649c4f2371353d1ad9e8ef (patch)
tree088251dd43b6434ffea8bfe305768a46a46023d1 /app/controllers/users_controller.rb
parent61d0662dd923169c5c5aa1d4624f04d6e9dbe43d (diff)
downloadchouette-core-2dca376725013ac504649c4f2371353d1ad9e8ef.tar.bz2
fix organisation. Refs #111
Diffstat (limited to 'app/controllers/users_controller.rb')
-rw-r--r--app/controllers/users_controller.rb14
1 files changed, 3 insertions, 11 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ee9cbcda1..3c9ad214d 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,17 +1,9 @@
class UsersController < InheritedResources::Base
def create
- Rails.logger.info( "call user_controller.create")
- Rails.logger.info( "resource=#{build_resource.inspect}")
- Rails.logger.info( "resourc.valid?e=#{build_resource.valid?}")
- Rails.logger.info( "resourc.errors=#{build_resource.errors.inspect}")
- create! do |success, failure|
- success.html {
- Rails.logger.info( "success user_controller")
- mail = UserMailer.welcome(@user)
- mail.deliver
- redirect_to organisation_user_path(@user) }
- end
+ @user = current_organisation.users.create(params[:user])
+ @user.invite!
+ respond_with @user, :location => organisation_user_path(@user)
end
def update