Fix merge V2.5 pb for UsersController

2 files changed, 19 insertions, 9 deletions

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6f776e938..83d9dc3d6 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,18 +1,28 @@
 class UsersController < BreadcrumbController
 
   defaults :resource_class => User
-  respond_to :html, :only => [:show]
-  
+
+  def create
+    @user = current_organisation.users.build(params[:user])
+
+    if @user.valid?
+      @user.invite!
+      respond_with @user, :location => organisation_user_path(@user)
+    else
+      render :action => 'new'
+    end
+  end
+
+  def update
+    update! do |success, failure|
+      success.html { redirect_to organisation_user_path(@user) }
+    end
+  end
+
   def destroy
     destroy! do |success, failure|
       success.html { redirect_to organisation_path }
     end
-  end  
-
-  protected
-
-  def begin_of_association_chain
-    current_organisation
   end
 
 end
diff --git a/app/models/compliance_check.rb b/app/models/compliance_check.rb
index a2b2a7f52..bf47d0248 100644
--- a/app/models/compliance_check.rb
+++ b/app/models/compliance_check.rb
@@ -38,7 +38,7 @@ class ComplianceCheck
   end
 
   def rule_parameter_set
-    rule_parameter_set = datas.links.select{ |link| link["rel"] == "validation_params"}.first.href
+    rule_parameter_set = links["validation_params"]
     if rule_parameter_set
       response = Ievkit.get(rule_parameter_set)
       rule_parameter_set = RuleParameterSet.new.tap { |rps| rps.parameters = response.validation }