2 files changed, 10 insertions, 24 deletions
diff --git a/app/controllers/subscriptions_controller.rb b/app/controllers/subscriptions_controller.rb
index e860e94ec..a1dca5a5d 100644
--- a/app/controllers/subscriptions_controller.rb
+++ b/app/controllers/subscriptions_controller.rb
@@ -1,18 +1,12 @@
-class SubscriptionsController < Devise::RegistrationsController
+class SubscriptionsController < InheritedResources::Base
+  skip_filter :authenticate_user!
   
-  def new
-    @subscription = Subscription.new
-  end
   def create
-    @subscription = Subscription.new(params[:subscription])
-
-    if @subscription.save
-      sign_in @subscription.user
-      flash[:notice] = t('subscriptions.success')
-      redirect_to referentials_path
-    else
-      flash[:error] = t('subscriptions.failure')
-      render :action => "new"
+    create! do |success, failure|
+      success.html do
+        sign_in resource.user
+        redirect_to referentials_path
+      end
     end
   end
 
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